fix some issues raised by mentor

ctco-dev · Sep 5, 2018 · f6987ae · f6987ae
1 parent d248106
commit f6987ae
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 19 deletions.
diff --git a/src/main/java/lv/ctco/javaschool/goal/boundary/GoalApi.java b/src/main/java/lv/ctco/javaschool/goal/boundary/GoalApi.java
@@ -211,7 +211,7 @@ public void setStatusAchieved(@PathParam("id") Long goalId) {
         Optional<Goal> goal = goalStore.getGoalById(goalId);
         if (goal.isPresent()) {
             Goal g = goal.get();
-            if (g.getUser() == user) {
+            if (g.getUser().equals(user)) {
                 g.setStatus(GoalStatus.ACHIEVED);
             } else {
                 throw new ValidationException("Current Goal does not belong to you so you can not Edit Status");

diff --git a/src/main/java/lv/ctco/javaschool/goal/control/GoalStore.java b/src/main/java/lv/ctco/javaschool/goal/control/GoalStore.java
@@ -33,9 +33,10 @@ public List<Goal> getGoalsListFor(User user) {
 
     private List<Goal> CheckStatus(List<Goal> goals) {
         List<Goal> goalsToReturn = new ArrayList<>();
+        LocalDate localDateNow = LocalDate.now();
         for (Goal goal : goals) {
-            if ((goal.getDeadlineDate().isBefore(LocalDate.now())
-                    || goal.getDeadlineDate().isEqual(LocalDate.now()))
+            if ((goal.getDeadlineDate().isBefore(localDateNow)
+                    || goal.getDeadlineDate().isEqual(localDateNow))
                     && goal.getStatus() != GoalStatus.ACHIEVED) {
                 goal.setStatus(GoalStatus.OVERDUE);
             }

diff --git a/src/main/java/lv/ctco/javaschool/goal/entity/domain/Goal.java b/src/main/java/lv/ctco/javaschool/goal/entity/domain/Goal.java
@@ -36,14 +36,6 @@ public class Goal {
     @Enumerated(EnumType.STRING)
     private GoalStatus status;
 
-    public GoalStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(GoalStatus status) {
-        this.status = status;
-    }
-
     public Goal() {
     }
 
@@ -56,6 +48,14 @@ public Goal(Long id, User user, Set<Tag> tags, String goalMessage, LocalDate dea
         this.registeredDate = registeredDate;
     }
 
+    public GoalStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(GoalStatus status) {
+        this.status = status;
+    }
+
     public Set<Tag> getTags() {
         return tags;
     }
@@ -103,4 +103,33 @@ public LocalDateTime getRegisteredDate() {
     public void setRegisteredDate(LocalDateTime registeredDate) {
         this.registeredDate = registeredDate;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Goal goal = (Goal) o;
+
+        if (id != null ? !id.equals(goal.id) : goal.id != null) return false;
+        if (user != null ? !user.equals(goal.user) : goal.user != null) return false;
+        if (tags != null ? !tags.equals(goal.tags) : goal.tags != null) return false;
+        if (goalMessage != null ? !goalMessage.equals(goal.goalMessage) : goal.goalMessage != null) return false;
+        if (deadlineDate != null ? !deadlineDate.equals(goal.deadlineDate) : goal.deadlineDate != null) return false;
+        if (registeredDate != null ? !registeredDate.equals(goal.registeredDate) : goal.registeredDate != null)
+            return false;
+        return status == goal.status;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (user != null ? user.hashCode() : 0);
+        result = 31 * result + (tags != null ? tags.hashCode() : 0);
+        result = 31 * result + (goalMessage != null ? goalMessage.hashCode() : 0);
+        result = 31 * result + (deadlineDate != null ? deadlineDate.hashCode() : 0);
+        result = 31 * result + (registeredDate != null ? registeredDate.hashCode() : 0);
+        result = 31 * result + (status != null ? status.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/src/main/webapp/app/js/findgoals-page.js b/src/main/webapp/app/js/findgoals-page.js
@@ -23,7 +23,6 @@ function findUserByName() {
     var dto = {
         "usersearch": username.value
     };
-    console.log(JSON.stringify(dto));
     fetch("/api/goal/search-user", {
         "method": "POST",
         headers: {
@@ -34,7 +33,6 @@ function findUserByName() {
     }).then(function (response) {
         return response.json();
     }).then(function (users) {
-        console.log(users);
         if (users.length > 0) {
             var tabledata = {'users': users};
             document.getElementById("Users-List").classList.remove("w3-hide");
@@ -49,7 +47,6 @@ function findGoalsByTag() {
     var dto = {
         "goalsearch": tag.value
     };
-    console.log(JSON.stringify(dto));
     fetch("/api/goal/search-goals", {
         "method": "POST",
         headers: {
@@ -60,7 +57,6 @@ function findGoalsByTag() {
     }).then(function (response) {
         return response.json();
     }).then(function (goals) {
-        console.log(goals);
         if (goals.length > 0) {
             var tabledata = {'goals': goals};
             document.getElementById("Goals-List").classList.remove("w3-hide");

diff --git a/src/main/webapp/app/js/goal-page.js b/src/main/webapp/app/js/goal-page.js
@@ -156,7 +156,6 @@ function setStatusAchieved(id) {
         if (response.status === 204) {
             onLoad();
         } else {
-            console.log(response);
             alert("Something went wrong! error: " + response.status.toString());
             return false;
         }

diff --git a/src/main/webapp/app/js/start-page.js b/src/main/webapp/app/js/start-page.js
@@ -27,7 +27,6 @@ function showUserGoals() {
         return response.json();
     }).then(function (goals) {
         goalList = goals;
-        console.log(goals);
         var tabledata;
         if (goals.length > 0) {
             tabledata = {"goals": goals};

diff --git a/src/main/webapp/app/js/user-page.js b/src/main/webapp/app/js/user-page.js
@@ -34,13 +34,11 @@ function loadUser() {
 function setDataToFields(userDto) {
     var list = userDto.goalList;
     var tabledata;
-    console.log(userDto);
     w3.displayObject("title", userDto);
     w3.displayObject("username", userDto);
     w3.displayObject("email-and-phone", userDto);
     if (list.length > 0) {
         tabledata = {"goals": list};
-        console.log(tabledata);
         w3DisplayData("goals-list", tabledata);
     } else {
         document.getElementById("hidden").classList.remove("w3-hide");