Removed unnecessary login page and references, simplified habit controller, added better interface for user habit handling

Author: BuildTools

src/main/java/com/justin/healthyhabits/controllers/HabitsController.java

@@ -11,8 +11,6 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import java.util.ArrayList;
-import java.util.Map;
 import java.util.NoSuchElementException;
 
 @Controller
@@ -35,51 +33,25 @@ public String habitForm(Model model) {
     @PostMapping("/habits")
     public String habitSubmit(@ModelAttribute Habit habit, Model model) {
         habit.setName(habit.getName().trim());
+
         model.addAttribute("habit", habit);
         model.addAttribute("user", userd.getUser());
+
+        String habitSubmissionType = habit.getHabitType();
+        boolean habitExists = userd.getUser().hasHabit(habit.getName());
+
         try {
-            if (habit.getHabitType().equals("add")) {
-                if (!DataValidation.isHabitValid((habit))) return "errorpage";
-                else {
-                    if (habitExists(habit)) updateHabit(habit);
-                    else addNewHabit(habit);
-                    }
-            } else if (habit.getHabitType().equals("remove")) {
-                userd.getUser().getHabits().remove(habit.getName());
+            if (!DataValidation.isHabitValid((habit))) return "errorpage";
+            if (habitSubmissionType.equals("add")) {
+                if (habitExists) userd.getUser().saveHabit(habit);
+                else userd.getUser().addHabit(habit);
+            } else if (habitSubmissionType.equals("remove")) {
+                userd.getUser().removeHabit(habit.getName());
             }
             userService.saveUser(userd.getUser());
-
         } catch (NullPointerException | NoSuchElementException e) {
             return "errorpage";
         }
         return "habitspage";
     }
-
-    private Map<String, Habit> getUserHabits() {
-        return userd.getUser().getHabits();
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addNewHabit(Habit habit) {
-        ArrayList<Long> dates = new ArrayList<>();
-        dates.add(getDate());
-        habit.setDates(dates);
-        userd.getUser().getHabits().put(habit.getName(), habit);
-    }
-
-    private boolean habitExists(Habit habit) {
-        return getUserHabits().containsKey(habit.getName());
-    }
-
-    private void updateHabit(Habit habit) {
-        if (getUserHabits().get(habit.getName()) != null) {
-            userd.getUser().getHabits().get(habit.getName()).addDate(getDate());
-            userd.getUser().getHabits().get(habit.getName()).addRating(habit.getRatings().get(0));
-            userService.saveUser(userd.getUser());
-        }
-    }
-
-    private long getDate() {
-        return System.currentTimeMillis();
-    }
 }

src/main/java/com/justin/healthyhabits/controllers/LoginController.java

@@ -1,6 +1,7 @@
 package com.justin.healthyhabits.user;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.Map;
 
 @Entity
@@ -61,4 +62,30 @@ public void setHabits(Map<String, Habit> habits) {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public void addHabit(Habit habit) {
+        ArrayList<Long> dates = new ArrayList<>();
+        dates.add(System.currentTimeMillis());
+        habit.setDates(dates);
+        getHabits().put(habit.getName(), habit);
+    }
+
+    public Habit removeHabit(String habitId) {
+        return getHabits().remove(habitId);
+    }
+
+    public boolean saveHabit(Habit habit) {
+        boolean habitExists = getHabits().get(habit.getName()) != null;
+        if (habitExists) {
+            getHabits().get(habit.getName()).addDate(System.currentTimeMillis());
+            getHabits().get(habit.getName()).addRating(habit.getRatings().get(0));
+            return true;
+        }
+        return false;
+    }
+
+    public boolean hasHabit(String habitId) {
+        return getHabits().containsKey(habitId);
+    }
+
 }

src/main/java/com/justin/healthyhabits/user/User.java

@@ -31,7 +31,6 @@
                     <a class="navbar-link" href="">Account</a>
                 </div>
                 <div class="dropdown-content">
-                    <a href="http://justinm.tech/login">Login</a>
                     <a href="http://justinm.tech/logout">Logout</a>
                     <a href="http://justinm.tech/register">Register</a>
                 </div>

src/main/resources/templates/errorpage.html

@@ -29,7 +29,6 @@
                             <a class="navbar-link" href="">Account</a>
                         </div> 
                     <div class="dropdown-content">
-                        <a href="http://justinm.tech/login">Login</a>
                         <a href="http://justinm.tech/logout">Logout</a>
                         <a href="http://justinm.tech/register">Register</a>
                     </div>

src/main/resources/templates/home.html

@@ -31,7 +31,6 @@
                             <a class="navbar-link" href="">Account</a>
                         </div> 
                     <div class="dropdown-content">
-                        <a href="http://justinm.tech/login">Login</a>
                         <a href="http://justinm.tech/register">Register</a>
                     </div>
                     </div>