work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Context.java

@@ -37,7 +37,7 @@
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true, exclude = "userAccount")
 @ToString(callSuper = true, exclude = "userAccount")
-public class Context extends AuditModel implements Serializable, ComparableById<Context> {
+public class Context extends AuditModel implements Serializable, ComparableById<Context>,Comparable<Context> {
 
     private static final long serialVersionUID = -5035732370606951871L;
 
@@ -102,4 +102,8 @@ public boolean equalsByUuid(Context otherObject) {
         return super.equalsByMyUuid(otherObject);
     }
 
+    @Override
+    public int compareTo(Context o) {
+      return this.nameDe.compareTo(o.nameDe);
+    }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Project.java

@@ -12,6 +12,7 @@
 
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +35,7 @@
 @Getter
 @Setter
 @ToString(callSuper = true, exclude = {"children","parent","description"})
-public class Project extends AuditModel implements Serializable, ComparableById<Project> {
+public class Project extends AuditModel implements Serializable, ComparableById<Project>, Comparable<Project> {
 
     private static final long serialVersionUID = 4566653175832872422L;
     public final static long rootProjectId = 0L;
@@ -84,10 +85,14 @@ public class Project extends AuditModel implements Serializable, ComparableById<
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent", cascade = {CascadeType.ALL})
     private List<Project> children = new ArrayList<>();
 
-  @Transient
-  public String getUrlRoot() {
-    return "redirect:/project/root";
-  }
+    @NotNull
+    @Column(name = "collapsed", nullable = false)
+    private Boolean collapsed;
+
+    @Transient
+    public String getUrlRoot() {
+      return "redirect:/project/root";
+    }
 
     @Transient
     public String getUrl() {
@@ -165,18 +170,24 @@ public String out(){
         return "Project: "+name+" ("+id+")";
     }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof Project)) return false;
-    if (!super.equals(o)) return false;
-    Project project = (Project) o;
-    return Objects.equals(getParent(), project.getParent()) && Objects.equals(getContext(), project.getContext()) && Objects.equals(getName(), project.getName()) && Objects.equals(getDescription(), project.getDescription());
-  }
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof Project)) return false;
+      if (!super.equals(o)) return false;
+      Project project = (Project) o;
+      return Objects.equals(getParent(), project.getParent()) && Objects.equals(getContext(), project.getContext()) && Objects.equals(getName(), project.getName()) && Objects.equals(getDescription(), project.getDescription());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(super.hashCode(), getParent(), getContext(), getName(), getDescription());
+    }
+
+    @Override
+    public int compareTo(Project o) {
+      return this.name.compareTo(o.name);
+    }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode(), getParent(), getContext(), getName(), getDescription());
-  }
 }
 

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java

@@ -151,7 +151,7 @@
 @Setter
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true, exclude="text")
-public class Task extends AuditModel implements Serializable, ComparableById<Task> {
+public class Task extends AuditModel implements Serializable, ComparableById<Task>, Comparable<Task> {
 
     private static final long serialVersionUID = 5247710652586269801L;
 
@@ -496,4 +496,9 @@ public void moveTaskToRootProject() {
     public void moveTaskToAnotherProject(Project project) {
         pushProject(project);
     }
+
+  @Override
+  public int compareTo(Task o) {
+    return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+  }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/search/SearchRequest.java

@@ -31,7 +31,7 @@
 @ToString(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class SearchRequest extends AuditModel implements Serializable, ComparableById<SearchRequest> {
+public class SearchRequest extends AuditModel implements Serializable, ComparableById<SearchRequest>,Comparable<SearchRequest> {
 
     private static final long serialVersionUID = 7860692526488291439L;
 
@@ -77,4 +77,9 @@ public boolean equalsByUniqueConstraint(SearchRequest otherObject) {
     public boolean equalsByUuid(SearchRequest otherObject) {
         return super.equalsByMyUuid(otherObject);
     }
+
+  @Override
+  public int compareTo(SearchRequest o) {
+    return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+  }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/search/SearchResult.java

@@ -36,7 +36,7 @@
 @ToString(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class SearchResult extends AuditModel implements Serializable, ComparableById<SearchResult> {
+public class SearchResult extends AuditModel implements Serializable, ComparableById<SearchResult>, Comparable<SearchResult> {
 
     private static final long serialVersionUID = 1682809351146047764L;
 
@@ -102,4 +102,10 @@ public boolean equalsByUniqueConstraint(SearchResult otherObject) {
     public boolean equalsByUuid(SearchResult otherObject) {
         return super.equalsByMyUuid(otherObject);
     }
+
+
+  @Override
+  public int compareTo(SearchResult o) {
+    return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+  }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccount.java

@@ -36,7 +36,7 @@
 @Setter
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true, exclude = {"userPassword","defaultLanguage","defaultContext","lastLoginTimestamp"})
-public class UserAccount extends AuditModel implements Serializable, ComparableById<UserAccount> {
+public class UserAccount extends AuditModel implements Serializable, ComparableById<UserAccount>,Comparable<UserAccount> {
 
     private static final long serialVersionUID = 7860692526488291439L;
 
@@ -141,4 +141,8 @@ public static UserAccount createUserAccount(
         return u;
     }
 
+    @Override
+    public int compareTo(UserAccount o) {
+      return this.userEmail.compareTo(o.userEmail);
+    }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountChatMessage.java

@@ -40,7 +40,7 @@
 @ToString(callSuper=true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserAccountChatMessage extends AuditModel implements Serializable {
+public class UserAccountChatMessage extends AuditModel implements Serializable, Comparable<UserAccountChatMessage> {
 
     private static final long serialVersionUID = 4263078228257938175L;
 
@@ -72,4 +72,8 @@ public class UserAccountChatMessage extends AuditModel implements Serializable {
     @JoinColumn(name = "user_account_id_receiver", nullable = false)
     private UserAccount receiver;
 
+    @Override
+    public int compareTo(UserAccountChatMessage o) {
+      return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+    }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPassword.java

@@ -25,7 +25,7 @@
 )
 @Getter
 @Setter
-public class UserAccountPassword extends AuditModel implements Serializable, ComparableById<UserAccountPassword> {
+public class UserAccountPassword extends AuditModel implements Serializable, ComparableById<UserAccountPassword>, Comparable<UserAccountPassword> {
 
     private static final long serialVersionUID = 7860692526488291439L;
 
@@ -67,4 +67,9 @@ public boolean equalsByUniqueConstraint(UserAccountPassword otherObject) {
     public boolean equalsByUuid(UserAccountPassword otherObject) {
         return this.getUuid().compareTo(otherObject.getUuid())==0;
     }
+
+  @Override
+  public int compareTo(UserAccountPassword o) {
+    return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+  }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordRecovery.java

@@ -28,7 +28,7 @@
         @Index(name = "ix_user_account_password_recovery_row_created_at", columnList = "row_created_at")
     }
 )
-public class UserAccountPasswordRecovery extends AuditModel implements Serializable {
+public class UserAccountPasswordRecovery extends AuditModel implements Serializable,Comparable<UserAccountPasswordRecovery> {
 
     private static final long serialVersionUID = 6860716425733119940L;
 
@@ -135,4 +135,9 @@ public String toString() {
                 ", rowUpdatedAt=" + rowUpdatedAt +
                 '}';
     }
+
+  @Override
+  public int compareTo(UserAccountPasswordRecovery o) {
+    return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+  }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountRegistration.java

@@ -29,7 +29,7 @@
         @Index(name = "ix_user_account_registration_row_created_at", columnList = "row_created_at")
     }
 )
-public class UserAccountRegistration extends AuditModel implements Serializable {
+public class UserAccountRegistration extends AuditModel implements Serializable,Comparable<UserAccountRegistration> {
 
     private static final long serialVersionUID = -1955967514018161878L;
 
@@ -136,4 +136,9 @@ public String toString() {
                 ", rowUpdatedAt=" + rowUpdatedAt +
                 '}';
     }
+
+  @Override
+  public int compareTo(UserAccountRegistration o) {
+    return this.rowCreatedAt.compareTo(o.rowCreatedAt);
+  }
 }