Merge pull request #118 from 1e5i-Shark/dev

dev -> main
1e5i-Shark · Mar 14, 2024 · 895c49d · 895c49d
2 parents 081afbc + a1bd33b
commit 895c49d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/ei/algobaroapi/domain/chat/dto/MessageResponse.java b/src/main/java/ei/algobaroapi/domain/chat/dto/MessageResponse.java
@@ -65,11 +65,11 @@ public static MessageResponse changeHost(Long memberId) {
         );
     }
 
-    public static MessageResponse startCoding(Long memberId) {
+    public static MessageResponse startCoding(Long memberId, String endTime) {
         return new MessageResponse(
                 memberId,
                 MessageType.START_CODING,
-                null
+                endTime
         );
     }
 

diff --git a/src/main/java/ei/algobaroapi/domain/chat/service/ChatServiceImpl.java b/src/main/java/ei/algobaroapi/domain/chat/service/ChatServiceImpl.java
@@ -3,10 +3,12 @@
 import ei.algobaroapi.domain.chat.dto.MessageResponse;
 import ei.algobaroapi.domain.member.domain.Member;
 import ei.algobaroapi.domain.member.service.MemberService;
+import ei.algobaroapi.domain.room.dto.response.RoomDetailResponseDto;
 import ei.algobaroapi.domain.room.service.RoomService;
 import ei.algobaroapi.domain.room_member.dto.request.HostManualChangeRequestDto;
 import ei.algobaroapi.domain.room_member.dto.response.RoomExitResponse;
 import ei.algobaroapi.domain.room_member.service.RoomMemberService;
+import java.time.LocalDateTime;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -70,8 +72,15 @@ public void changeHostManually(
 
     @Override
     public void startCodingTest(String roomShortUuid, Long memberId) {
-        roomService.startCodingTest(roomShortUuid);
-        messageService.sendMessage(roomShortUuid, MessageResponse.startCoding(memberId));
+        RoomDetailResponseDto roomDetailResponseDto = roomService.startCodingTest(roomShortUuid);
+        Integer timeLimitMinute = roomDetailResponseDto.getTimeLimit();
+        messageService.sendMessage(
+                roomShortUuid,
+                MessageResponse.startCoding(
+                        memberId,
+                        LocalDateTime.now().plusMinutes(timeLimitMinute).toString()
+                )
+        );
     }
 
     @Override