Merge pull request #56 from ctco-dev/status-goals

Status goals
ctco-dev · Sep 6, 2018 · 0622e14 · 0622e14
2 parents 75e27b4 + e052693
commit 0622e14
Show file tree

Hide file tree

Showing 19 changed files with 192 additions and 69 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
@@ -8,6 +8,7 @@
 import lv.ctco.javaschool.goal.control.TagParser;
 import lv.ctco.javaschool.goal.entity.domain.Comment;
 import lv.ctco.javaschool.goal.entity.domain.Goal;
+import lv.ctco.javaschool.goal.entity.domain.GoalStatus;
 import lv.ctco.javaschool.goal.entity.domain.Tag;
 import lv.ctco.javaschool.goal.entity.dto.CommentDto;
 import lv.ctco.javaschool.goal.entity.dto.GoalDto;
@@ -17,6 +18,7 @@
 import lv.ctco.javaschool.goal.entity.dto.UserDto;
 import lv.ctco.javaschool.goal.entity.exception.InvalidGoalException;
 import lv.ctco.javaschool.goal.entity.exception.InvalidUserException;
+import lv.ctco.javaschool.goal.entity.exception.ValidationException;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ejb.Stateless;
@@ -81,7 +83,7 @@ public void createNewGoal(GoalFormDto goalDto) {
             goal.setTags(tagSet);
 
             goal.setDeadlineDate(goalDto.getDeadline());
-
+            goal.setStatus(GoalStatus.OPEN);
             goal.setUser(user);
             goal.setRegisteredDate(LocalDateTime.now());
             goalStore.addGoal(goal);
@@ -152,7 +154,6 @@ public List<TagDto> returnAllTags() {
     }
 
     @POST
-    @RolesAllowed({"ADMIN", "USER"})
     @Path("/search-goals")
     public List<GoalDto> getGoalsByTag(JsonObject searchDto) {
         List<GoalDto> goalDtoList = new ArrayList<>();
@@ -173,7 +174,6 @@ public List<GoalDto> getGoalsByTag(JsonObject searchDto) {
     }
 
     @POST
-    @RolesAllowed({"ADMIN", "USER"})
     @Path("/search-user")
     public List<UserSearchDto> getUsersByUsername(JsonObject searchDto) {
         List<UserSearchDto> userDtoList = new ArrayList<>();
@@ -191,7 +191,6 @@ public List<UserSearchDto> getUsersByUsername(JsonObject searchDto) {
     }
 
     @GET
-    @RolesAllowed({"ADMIN", "USER"})
     @Path("/user/{id}")
     public UserDto getUserById(@PathParam("id") Long id) {
         Optional<User> user = userStore.findUserById(id);
@@ -204,5 +203,22 @@ public UserDto getUserById(@PathParam("id") Long id) {
             throw new InvalidUserException();
         }
     }
+
+    @POST
+    @Path("/mygoals/{id}")
+    public void setStatusAchieved(@PathParam("id") Long goalId) {
+        User user = userStore.getCurrentUser();
+        Optional<Goal> goal = goalStore.getGoalById(goalId);
+        if (goal.isPresent()) {
+            Goal g = goal.get();
+            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");
+            }
+        } else {
+            throw new ValidationException("The Goal does not exist");
+        }
+    }
 }
 
diff --git a/src/main/java/lv/ctco/javaschool/goal/control/DtoConverter.java b/src/main/java/lv/ctco/javaschool/goal/control/DtoConverter.java
@@ -25,6 +25,7 @@ public static GoalDto convertGoalToGoalDto(Goal goal) {
         dto.setDaysLeft(DateTimeConverter.countDaysLeft(goal.getDeadlineDate()));
         dto.setId(goal.getId());
         dto.setTags(goal.getTags());
+        dto.setGoalStatus(goal.getStatus());
         return dto;
     }
 
@@ -38,6 +39,7 @@ public static UserLoginDto convertUserToUserLoginDto(User user) {
 
     public static CommentDto convertCommentToCommentDto(Comment comment) {
         CommentDto dto = new CommentDto();
+        dto.setUserId(comment.getUser().getId());
         dto.setUsername(comment.getUser().getUsername());
         dto.setRegisteredDate(comment.getRegisteredDate().format(DateTimeConverter.FORMATTER_DATE_TIME));
         dto.setCommentMessage(comment.getCommentMessage());

diff --git a/src/main/java/lv/ctco/javaschool/goal/control/GoalStore.java b/src/main/java/lv/ctco/javaschool/goal/control/GoalStore.java
@@ -3,11 +3,14 @@
 import lv.ctco.javaschool.auth.entity.domain.User;
 import lv.ctco.javaschool.goal.entity.domain.Comment;
 import lv.ctco.javaschool.goal.entity.domain.Goal;
+import lv.ctco.javaschool.goal.entity.domain.GoalStatus;
 import lv.ctco.javaschool.goal.entity.domain.Tag;
 
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -19,12 +22,27 @@ public class GoalStore {
     private EntityManager em;
 
     public List<Goal> getGoalsListFor(User user) {
-        return em.createQuery(
+        List<Goal> goals = em.createQuery(
                 "select g " +
                         "from Goal g " +
                         "where g.user = :user ", Goal.class)
                 .setParameter("user", user)
                 .getResultList();
+        return CheckStatus(goals);
+    }
+
+    private List<Goal> CheckStatus(List<Goal> goals) {
+        List<Goal> goalsToReturn = new ArrayList<>();
+        LocalDate localDateNow = LocalDate.now();
+        for (Goal goal : goals) {
+            if ((goal.getDeadlineDate().isBefore(localDateNow)
+                    || goal.getDeadlineDate().isEqual(localDateNow))
+                    && goal.getStatus() != GoalStatus.ACHIEVED) {
+                goal.setStatus(GoalStatus.OVERDUE);
+            }
+            goalsToReturn.add(goal);
+        }
+        return goalsToReturn;
     }
 
     public void addGoal(Goal goal) {

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
@@ -3,6 +3,8 @@
 import lv.ctco.javaschool.auth.entity.domain.User;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
@@ -31,6 +33,8 @@ public class Goal {
     private String goalMessage;
     private LocalDate deadlineDate;
     private LocalDateTime registeredDate;
+    @Enumerated(EnumType.STRING)
+    private GoalStatus status;
 
     public Goal() {
     }
@@ -44,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;
     }
@@ -91,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/java/lv/ctco/javaschool/goal/entity/domain/GoalStatus.java b/src/main/java/lv/ctco/javaschool/goal/entity/domain/GoalStatus.java
@@ -0,0 +1,7 @@
+package lv.ctco.javaschool.goal.entity.domain;
+
+public enum GoalStatus {
+    OPEN,
+    ACHIEVED,
+    OVERDUE
+}
diff --git a/src/main/java/lv/ctco/javaschool/goal/entity/dto/CommentDto.java b/src/main/java/lv/ctco/javaschool/goal/entity/dto/CommentDto.java
@@ -2,17 +2,26 @@
 
 public class CommentDto {
     private String username;
-
+    private Long userId;
     private String registeredDate;
     private String commentMessage;
 
     public CommentDto() {
     }
 
-    public CommentDto(String username, String localDateTime, String msg) {
+    public CommentDto(String username, String localDateTime, String msg, Long id) {
         this.username = username;
         this.registeredDate = localDateTime;
         this.commentMessage = msg;
+        this.userId = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
     public String getUsername() {

diff --git a/src/main/java/lv/ctco/javaschool/goal/entity/dto/GoalDto.java b/src/main/java/lv/ctco/javaschool/goal/entity/dto/GoalDto.java
@@ -1,5 +1,6 @@
 package lv.ctco.javaschool.goal.entity.dto;
 
+import lv.ctco.javaschool.goal.entity.domain.GoalStatus;
 import lv.ctco.javaschool.goal.entity.domain.Tag;
 
 import java.time.LocalDate;
@@ -15,6 +16,15 @@ public class GoalDto {
     private LocalDateTime registeredDate;
     private Set<Tag> tags;
     private int daysLeft;
+    private GoalStatus goalStatus;
+
+    public GoalStatus getGoalStatus() {
+        return goalStatus;
+    }
+
+    public void setGoalStatus(GoalStatus goalStatus) {
+        this.goalStatus = goalStatus;
+    }
 
     public Long getUserId() {
         return userId;

diff --git a/src/main/webapp/app/css/style.css b/src/main/webapp/app/css/style.css
@@ -83,9 +83,21 @@ ul {
     margin-bottom: 5%;
 }
 
+.ACHIEVED {
+    background-color: #27ff5a !important;
+}
+
+.OVERDUE {
+    background-color: #ff5953 !important;
+}
+
 input[type=date]::-webkit-clear-button,
 input[type=date]::-webkit-inner-spin-button,
 input[type=date]::-webkit-outer-spin-button {
     display: none;
     -webkit-appearance: none;
-}
+}
+
+span.ACHIEVED {
+    visibility: hidden !important;
+}
diff --git a/src/main/webapp/app/findgoals.jsp b/src/main/webapp/app/findgoals.jsp
@@ -54,7 +54,7 @@
         <th>Deadline</th>
         <th>Days left</th>
     </tr>
-    <tr w3-repeat="goals" id="{{id}}" onclick="redirectToGoalsAndComments(id)">
+    <tr w3-repeat="goals" id="{{id}}" class="{{goalStatus}}" onclick="redirectToGoalsAndComments(id)">
         <td>{{goalMessage}}</td>
         <td>{{deadlineDate}}</td>
         <td>{{daysLeft}}</td>

diff --git a/src/main/webapp/app/goal.jsp b/src/main/webapp/app/goal.jsp
@@ -25,12 +25,16 @@
     <div class="button-div">
         <button id="edit-button" class="menu-button" onclick="editGoal()" type="button">Edit Goal</button>
     </div>
+    <div class="button-div" id="status-achieved">
+        <button class="menu-button" onclick="setStatusAchieved('{{id}}')" type="button">Achieved</button>
+    </div>
 </div>
 <div id="goal-fields">
     <div id="show-goal">
         <h3>Goal: {{goalMessage}}</h3>
         <h5>Author: <a onclick="redirectToUserById('{{userId}}')">{{username}}</a></h5>
-        <h5>Deadline: {{deadlineDate}} (days left: {{daysLeft}})</h5>
+        <h5>Deadline: {{deadlineDate}}</h5>
+        <h5 class="{{goalStatus}}">Goal status: {{goalStatus}}</h5>
         <div id="tags-list" w3-repeat="tags">
             <span id="{{id}}">{{tagMessage}}</span>
         </div>
@@ -61,12 +65,12 @@
             <hr>
             <ul id="sortable" class="w3-hide">
                 <li w3-repeat="comments" class="repeatable">
-                    <strong>{{username}}</strong>
+                    <strong> <a onclick="redirectToUserById('{{userId}}')">{{username}}</a></strong>
                     <small>
                         <span class="glyphicon glyphicon-time"></span>{{registeredDate}}
                     </small>
-                    <br/>
-                    <br/>
+                    </br>
+                    </br>
                     <p>{{commentMessage}}</p>
                 </li>
             </ul>

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");