work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/db/UserChatMessageController.java

@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.domain.AbstractController;
-import org.woehlke.java.simpleworklist.domain.db.user.UserChatMessage;
+import org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage;
 import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageForm;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
@@ -46,7 +46,7 @@ public final String getLastMessagesBetweenCurrentAndOtherUser(
         UserAccount thisUser = context.getUserAccount();
         model.addAttribute("userSession",userSession);
         ChatMessageForm chatMessageForm = new ChatMessageForm();
-        Page<UserChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
+        Page<UserAccountChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
         model.addAttribute("newUser2UserMessage", chatMessageForm);
         model.addAttribute("otherUser", otherUser);
         model.addAttribute("user2UserMessagePage", user2UserMessagePage);
@@ -78,7 +78,7 @@ public final String sendNewMessageToOtherUser(
             for(ObjectError objectError:result.getAllErrors()){
                 log.info("result.hasErrors: "+objectError.toString());
             }
-            Page<UserChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
+            Page<UserAccountChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
             model.addAttribute("otherUser", otherUser);
             model.addAttribute("user2UserMessagePage", user2UserMessagePage);
             model.addAttribute("userSession", userSession);

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

@@ -6,7 +6,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-//import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.java.simpleworklist.domain.meso.language.Language;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
 import org.woehlke.java.simpleworklist.application.framework.AuditModel;
@@ -117,7 +116,12 @@ public boolean equalsByUuid(UserAccount otherObject) {
         return super.equalsByMyUuid(otherObject);
     }
 
-    public static UserAccount createUserAccount(final String userEmail, final String userFullname, final String userPassword, Context contexts[]){
+    public static UserAccount createUserAccount(
+      final String userEmail,
+      final String userFullname,
+      final String userPassword,
+      Context[] contexts
+    ){
         Date now = new Date();
         UserAccount u = new UserAccount();
         u.setUserEmail(userEmail);

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

@@ -15,7 +15,7 @@
  */
 @Entity
 @Table(
-    name="user_chat_message",
+    name="user_account_chat_message",
     uniqueConstraints = {
         @UniqueConstraint(
             name="ux_user_message",
@@ -30,7 +30,7 @@
 @NamedQueries({
   @NamedQuery(
     name = "queryFindAllMessagesBetweenCurrentAndOtherUser",
-    query = "select m from UserChatMessage m "
+    query = "select m from UserAccountChatMessage m "
       + "where (m.sender = :thisUser and m.receiver = :otherUser) "
       + "or (m.sender = :otherUser and m.receiver = :thisUser)",
     lockMode = LockModeType.READ
@@ -42,7 +42,7 @@
 @ToString(callSuper=true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserChatMessage extends AuditModel implements Serializable {
+public class UserAccountChatMessage extends AuditModel implements Serializable {
 
     private static final long serialVersionUID = 4263078228257938175L;
 

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/account/UserAccountServiceImpl.java

@@ -14,7 +14,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
-import org.woehlke.java.simpleworklist.domain.db.user.UserChatMessage;
+import org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageRepository;
 import org.woehlke.java.simpleworklist.domain.db.data.context.ContextRepository;
@@ -103,8 +103,8 @@ public Map<Long, Integer> getNewIncomingMessagesForEachOtherUser(UserAccount rec
             if(receiver.getId().longValue() == sender.getId().longValue()){
                 newIncomingMessagesForEachOtherUser.put(sender.getId(),0);
             } else {
-                List<UserChatMessage> userChatMessages = userMessageRepository.findBySenderAndReceiverAndReadByReceiver(sender,receiver,false);
-                newIncomingMessagesForEachOtherUser.put(sender.getId(), userChatMessages.size());
+                List<UserAccountChatMessage> userAccountChatMessages = userMessageRepository.findBySenderAndReceiverAndReadByReceiver(sender,receiver,false);
+                newIncomingMessagesForEachOtherUser.put(sender.getId(), userAccountChatMessages.size());
             }
         }
         return newIncomingMessagesForEachOtherUser;

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/chat/ChatMessageRepository.java

@@ -7,29 +7,29 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
-import org.woehlke.java.simpleworklist.domain.db.user.UserChatMessage;
+import org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage;
 
 import java.util.List;
 
 /**
  * Created by Fert on 16.02.2016.
  */
 @Repository
-public interface ChatMessageRepository extends JpaRepository<UserChatMessage, Long> {
+public interface ChatMessageRepository extends JpaRepository<UserAccountChatMessage, Long> {
 
     @Query(name="queryFindAllMessagesBetweenCurrentAndOtherUser")
-    Page<UserChatMessage> findAllMessagesBetweenCurrentAndOtherUser(
+    Page<UserAccountChatMessage> findAllMessagesBetweenCurrentAndOtherUser(
             @Param("thisUser") UserAccount thisUser,
             @Param("otherUser") UserAccount otherUser,
             Pageable request
     );
 
-    List<UserChatMessage> findByReceiverAndReadByReceiver(
+    List<UserAccountChatMessage> findByReceiverAndReadByReceiver(
             UserAccount receiver,
             boolean readByReceiver
     );
 
-    List<UserChatMessage> findBySenderAndReceiverAndReadByReceiver(
+    List<UserAccountChatMessage> findBySenderAndReceiverAndReadByReceiver(
             UserAccount sender, UserAccount receiver, boolean readByReceiver
     );
 

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/chat/ChatMessageService.java

@@ -3,22 +3,22 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
-import org.woehlke.java.simpleworklist.domain.db.user.UserChatMessage;
+import org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage;
 
 /**
  * Created by tw on 16.02.2016.
  */
 public interface ChatMessageService {
 
-    UserChatMessage sendNewUserMessage(
+    UserAccountChatMessage sendNewUserMessage(
         UserAccount thisUser,
         UserAccount otherUser,
         ChatMessageForm chatMessageForm
     );
 
     int getNumberOfNewIncomingMessagesForUser(UserAccount user);
 
-    Page<UserChatMessage> readAllMessagesBetweenCurrentAndOtherUser(
+    Page<UserAccountChatMessage> readAllMessagesBetweenCurrentAndOtherUser(
         UserAccount receiver, UserAccount sender, Pageable request
     );
 

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/chat/ChatMessageServiceImpl.java

@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.java.simpleworklist.domain.db.user.UserChatMessage;
+import org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,13 +31,13 @@ public ChatMessageServiceImpl(ChatMessageRepository userMessageRepository) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public UserChatMessage sendNewUserMessage(
+    public UserAccountChatMessage sendNewUserMessage(
         UserAccount thisUser,
         UserAccount otherUser,
         ChatMessageForm chatMessageForm
     ) {
         log.info("sendNewUserMessage");
-        UserChatMessage m = new UserChatMessage();
+        UserAccountChatMessage m = new UserAccountChatMessage();
         m.setSender(thisUser);
         m.setReceiver(otherUser);
         m.setReadByReceiver(false);
@@ -53,24 +53,24 @@ public int getNumberOfNewIncomingMessagesForUser(
         log.info("getNumberOfNewIncomingMessagesForUser");
         boolean readByReceiver = false;
         //TODO: #246 change List<Project> to Page<Project>
-        List<UserChatMessage> userChatMessageList =
+        List<UserAccountChatMessage> userAccountChatMessageList =
                 userMessageRepository.findByReceiverAndReadByReceiver(receiver, readByReceiver);
-        return userChatMessageList.size();
+        return userAccountChatMessageList.size();
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Page<UserChatMessage> readAllMessagesBetweenCurrentAndOtherUser(
+    public Page<UserAccountChatMessage> readAllMessagesBetweenCurrentAndOtherUser(
         UserAccount receiver,
         UserAccount sender,
         Pageable request
     ) {
         log.info("readAllMessagesBetweenCurrentAndOtherUser");
-        Page<UserChatMessage> user2UserMessagePage = userMessageRepository.findAllMessagesBetweenCurrentAndOtherUser(sender,receiver,request);
-        for(UserChatMessage userChatMessage : user2UserMessagePage){
-            if((!userChatMessage.getReadByReceiver()) && (receiver.getId().longValue()== userChatMessage.getReceiver().getId().longValue())){
-                userChatMessage.setReadByReceiver(true);
-                userMessageRepository.saveAndFlush(userChatMessage);
+        Page<UserAccountChatMessage> user2UserMessagePage = userMessageRepository.findAllMessagesBetweenCurrentAndOtherUser(sender,receiver,request);
+        for(UserAccountChatMessage userAccountChatMessage : user2UserMessagePage){
+            if((!userAccountChatMessage.getReadByReceiver()) && (receiver.getId().longValue()== userAccountChatMessage.getReceiver().getId().longValue())){
+                userAccountChatMessage.setReadByReceiver(true);
+                userMessageRepository.saveAndFlush(userAccountChatMessage);
             }
         }
         return userMessageRepository.findAllMessagesBetweenCurrentAndOtherUser(sender,receiver,request);

src/main/resources/messages_de.properties

@@ -58,11 +58,11 @@ pages.user.profile.delete.context=Kontext l
 pages.user.profile.change.language=Sprache einstellen
 pages.user.user2user.messages=Dialog mit anderen Benutzern
 pages.searchRequest=Search Results
-pages.userChatMessages.h1=Ihr Dialog mit
-pages.userChatMessages.newMessage=Neue Nachricht\:
-pages.userChatMessages.newUserMessageButton=Sende Nachricht
-pages.userChatMessages.showAllText1=Zeige alle Nachrichten
-pages.userChatMessages.showAllText2=(hier werden nur die letzten 20 Angezeigt)
+pages.userAccountChatMessages.h1=Ihr Dialog mit
+pages.userAccountChatMessages.newMessage=Neue Nachricht\:
+pages.userAccountChatMessages.newUserMessageButton=Sende Nachricht
+pages.userAccountChatMessages.showAllText1=Zeige alle Nachrichten
+pages.userAccountChatMessages.showAllText2=(hier werden nur die letzten 20 Angezeigt)
 pages.information.h1=Informationen
 project.add.h1=Neues Projekt
 project.add.description=Beschreibung

src/main/resources/messages_en.properties

@@ -57,11 +57,11 @@ pages.user.profile.delete.context=Delete one Context
 pages.user.profile.change.language=Choose Default Language
 pages.user.user2user.messages=Messages User2User
 pages.searchRequest=Search Results
-pages.userChatMessages.h1=Your Dialog with
-pages.userChatMessages.newMessage=New Message\:
-pages.userChatMessages.newUserMessageButton=Send Message
-pages.userChatMessages.showAllText1=Show all Messages
-pages.userChatMessages.showAllText2=(only the last 20 Messages are displayed here)
+pages.userAccountChatMessages.h1=Your Dialog with
+pages.userAccountChatMessages.newMessage=New Message\:
+pages.userAccountChatMessages.newUserMessageButton=Send Message
+pages.userAccountChatMessages.showAllText1=Show all Messages
+pages.userAccountChatMessages.showAllText2=(only the last 20 Messages are displayed here)
 project.add.h1=Add Project
 project.add.description=Description
 project.add.button=Add Project

src/main/resources/templates/user/messages/all.html

@@ -5,14 +5,14 @@
       xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
       xmlns:sd="http://www.thymeleaf.org/spring-data">
 <head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=true)">
-  <title th:text="'SimpleWorklist | ' + #{pages.userChatMessages.h1}">Title</title>
+  <title th:text="'SimpleWorklist | ' + #{pages.userAccountChatMessages.h1}">Title</title>
 </head>
 <body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
 
 <div th:fragment="mytwtitle">
   <div class="row my-3 py-3 col">
     <h1>
-      <strong th:utext="#{pages.userChatMessages.h1}">Your Dialog with</strong>
+      <strong th:utext="#{pages.userAccountChatMessages.h1}">Your Dialog with</strong>
     </h1>
     <h2>
       <small th:text="${otherUser.userFullname}">otherUser.userFullname</small>
@@ -28,7 +28,7 @@ <h2>
       <div class="col">
         <div class="card card-body" id="newUser2UserMessageForm">
           <div class="form-group col-12">
-            <label for="messageTextEditor" class="control-label my-2" th:utext="#{pages.userChatMessages.newMessage}">New Message:</label>
+            <label for="messageTextEditor" class="control-label my-2" th:utext="#{pages.userAccountChatMessages.newMessage}">New Message:</label>
             <textarea id="messageTextEditor" rows="3" cols="50"
                       th:field="*{messageText}" class="form-control form-control-lg">
             </textarea>
@@ -40,7 +40,7 @@ <h2>
           <div class="my-3">
             <button id="newUserMessageButton" type="submit" class="btn btn-primary">
               <i class="fas fa-envelope"></i>
-              <span th:utext="#{pages.userChatMessages.newUserMessageButton}">Send Message</span>
+              <span th:utext="#{pages.userAccountChatMessages.newUserMessageButton}">Send Message</span>
             </button>
           </div>
         </div>