## 2.3.31

* fixed #311 User Selfservice is broken
* Issue #312 User2UserMessage Chat is broken

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/application/common/AuditModel.java

@@ -1,6 +1,10 @@
 package org.woehlke.simpleworklist.application.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -16,6 +20,10 @@
     value = {"rowCreatedAt", "rowUpdatedAt"},
     allowGetters = true
 )
+@ToString
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper=false)
 public class AuditModel implements Serializable {
 
     private static final long serialVersionUID = 4399373914714726911L;
@@ -33,6 +41,7 @@ public class AuditModel implements Serializable {
     @Column(name = "row_updated_at", nullable = false)
     protected Date rowUpdatedAt;
 
+    /*
     public String getUuid() {
         return uuid;
     }
@@ -56,7 +65,9 @@ public Date getRowUpdatedAt() {
     public void setRowUpdatedAt(Date rowUpdatedAt) {
         this.rowUpdatedAt = rowUpdatedAt;
     }
+    */
 
+    /*
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -71,6 +82,7 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(getUuid(), getRowCreatedAt(), getRowUpdatedAt());
     }
+    */
 
     @Override
     public String toString() {

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java

@@ -31,7 +31,7 @@
 @Getter
 @Setter
 @EqualsAndHashCode
-@ToString
+@ToString(callSuper=true)
 @NoArgsConstructor
 @AllArgsConstructor
 public class User2UserMessage extends AuditModel implements Serializable {

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java

@@ -28,10 +28,10 @@
  */
 @Slf4j
 @Controller
-@RequestMapping(path = "/user/messages/")
+@RequestMapping(path = "/user2user")
 public class User2UserMessageController extends AbstractController {
 
-    @RequestMapping(path = "/{userId}/", method = RequestMethod.GET)
+    @RequestMapping(path = "/{userId}/messages", method = RequestMethod.GET)
     public final String getLastMessagesBetweenCurrentAndOtherUser(
             @PathVariable("userId") UserAccount otherUser,
             @PageableDefault(sort = "rowCreatedAt", direction = Sort.Direction.DESC) Pageable request,