Fix date in game chat message

baloise-incubator · Oct 20, 2023 · d96fb5d · d96fb5d
1 parent a74eb0c
commit d96fb5d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/angular-frontend/src/app/components/chat/chat.component.html b/angular-frontend/src/app/components/chat/chat.component.html
@@ -8,7 +8,7 @@
         [ngClass]="{'is-align-self-flex-end': message.user.name === currentUser}">
         <bal-card-subtitle>
             {{ message.timestamp.toLocaleString() }}
-            <bal-tag [color]="message.user.color" [light]="message.user.name === currentUser">
+            <bal-tag [color]="message.user.color" [light]="message.user.name === currentUser" class="ml-small">
                 {{ message.user.name }}
             </bal-tag>
         </bal-card-subtitle>

diff --git a/angular-frontend/src/app/components/chat/chat.component.ts b/angular-frontend/src/app/components/chat/chat.component.ts
@@ -37,15 +37,13 @@ export class ChatComponent implements OnInit, OnDestroy {
   addMessage(payload: any) {
     const newMessage = JSON.parse(payload.body) as ChatMessage;
     newMessage.timestamp = new Date(newMessage.timestamp);
-    console.log(newMessage);
     this.messages.push(newMessage);
   }
 
   sendMessage() {
     const text = this.messageText
     if (text !== "") {
       const payload = JSON.stringify({text: text, clientTimestamp: new Date()});
-      console.log(payload);
       this.client.publish({destination: "/app/chat", body: payload});
       this.messageText = "";
       this.chatMessageBox.nativeElement.focus();

diff --git a/spring-backend/src/main/java/com/baloise/collab/springbackend/chat/ChatWebSocketHandler.java b/spring-backend/src/main/java/com/baloise/collab/springbackend/chat/ChatWebSocketHandler.java
@@ -40,7 +40,7 @@ public OutgoingChatMessageDTO handleChatMessage(Message<String> message) throws
 
     public void sendSystemChatMessage(String chatMessage) {
         var systemUserDTO = new UserDTO("System", "danger");
-        var message = new OutgoingChatMessageDTO(chatMessage, systemUserDTO, new Date().toString());
+        var message = new OutgoingChatMessageDTO(chatMessage, systemUserDTO, new Date());
         messagingTemplate.convertAndSend("/topic/chat", message);
     }
 

diff --git a/...g-backend/src/main/java/com/baloise/collab/springbackend/chat/IncomingChatMessageDTO.java b/...g-backend/src/main/java/com/baloise/collab/springbackend/chat/IncomingChatMessageDTO.java
@@ -1,6 +1,8 @@
 package com.baloise.collab.springbackend.chat;
 
+import java.util.Date;
+
 public record IncomingChatMessageDTO(
     String text,
-    String clientTimestamp
+    Date clientTimestamp
 ) {}
diff --git a/...g-backend/src/main/java/com/baloise/collab/springbackend/chat/OutgoingChatMessageDTO.java b/...g-backend/src/main/java/com/baloise/collab/springbackend/chat/OutgoingChatMessageDTO.java
@@ -1,9 +1,11 @@
 package com.baloise.collab.springbackend.chat;
 
+import java.util.Date;
+
 import com.baloise.collab.springbackend.useradmin.UserDTO;
 
 public record OutgoingChatMessageDTO(
     String text,
     UserDTO user,
-    String timestamp
+    Date timestamp
 ) {}