From f737ae21ec07a5b5f55c2d08390b7172efc74012 Mon Sep 17 00:00:00 2001 From: Andriy Gaponov Date: Tue, 7 May 2024 10:12:45 +0300 Subject: [PATCH] add port 5557 in properties. add sentFromNickname in LastMessageResponseDto. --- .../java/com/chat/yourway/config/openapi/OpenApiConfig.java | 3 +++ .../dto/response/notification/LastMessageResponseDto.java | 1 + .../java/com/chat/yourway/service/ChatMessageServiceImpl.java | 1 + src/main/resources/application.properties | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chat/yourway/config/openapi/OpenApiConfig.java b/src/main/java/com/chat/yourway/config/openapi/OpenApiConfig.java index 7634be90..73afb9a7 100644 --- a/src/main/java/com/chat/yourway/config/openapi/OpenApiConfig.java +++ b/src/main/java/com/chat/yourway/config/openapi/OpenApiConfig.java @@ -19,6 +19,9 @@ @Server( description = "Local ENV", url = "http://localhost:8080" + ),@Server( + description = "Local ENV 2", + url = "http://localhost:5557" ), @Server( description = "PROD ENV", diff --git a/src/main/java/com/chat/yourway/dto/response/notification/LastMessageResponseDto.java b/src/main/java/com/chat/yourway/dto/response/notification/LastMessageResponseDto.java index 9469a522..d1b63af7 100644 --- a/src/main/java/com/chat/yourway/dto/response/notification/LastMessageResponseDto.java +++ b/src/main/java/com/chat/yourway/dto/response/notification/LastMessageResponseDto.java @@ -15,6 +15,7 @@ public class LastMessageResponseDto { private static final int MAX_LENGTH = 20; private LocalDateTime timestamp; + private String sentFromNickname; private String sentFrom; private String lastMessage; diff --git a/src/main/java/com/chat/yourway/service/ChatMessageServiceImpl.java b/src/main/java/com/chat/yourway/service/ChatMessageServiceImpl.java index 7b40e510..e56a2ee8 100644 --- a/src/main/java/com/chat/yourway/service/ChatMessageServiceImpl.java +++ b/src/main/java/com/chat/yourway/service/ChatMessageServiceImpl.java @@ -72,6 +72,7 @@ private void sendToTopic(Integer topicId, MessageResponseDto messageDto) { lastMessageDto.setTimestamp(messageDto.getTimestamp()); lastMessageDto.setSentFrom(messageDto.getSentFrom()); lastMessageDto.setLastMessage(messageDto.getContent()); + lastMessageDto.setSentFromNickname(messageDto.getSentFromNickname()); contactEventService.updateMessageInfoForAllTopicSubscribers(topicId, lastMessageDto); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5573639b..caa9875c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -41,7 +41,7 @@ security.jwt.expiration=3600000 security.jwt.refresh-expiration=604800000 #CORS: -cors.allowed-origins=${CORS_ORIGINS:http://localhost:8080,http://localhost:3000} +cors.allowed-origins=${CORS_ORIGINS:http://localhost:8080,http://localhost:3000,http://localhost:5557} cors.allowed-methods=GET, POST, PUT, PATCH, DELETE cors.allowed-headers=* cors.allow-credentials=true