Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] 안읽은 채팅 개수 (#158) #160

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.skyhorsemanpower.chatService.chat.data.dto.BeforeChatRoomDto;
import com.skyhorsemanpower.chatService.chat.data.dto.ChatRoomMemberResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.UnReadChatCountResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.UpdateProfileImageRequestDto;
import com.skyhorsemanpower.chatService.chat.data.dto.ChatRoomTitleResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.LeaveChatRoomDto;
Expand Down Expand Up @@ -38,4 +39,6 @@ PreviousChatResponseVo getPreviousChat(String roomNumber, LocalDateTime enterTim
void updateProfileImage(UpdateProfileImageRequestDto updateProfileImageRequestDto);

List<ChatRoomMemberResponseDto> getChatRoomMembers(String roomNumber);

UnReadChatCountResponseDto getUnreadChatCount(String roomNumber, String uuid);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mongodb.client.model.changestream.OperationType;
import com.skyhorsemanpower.chatService.chat.data.dto.BeforeChatRoomDto;
import com.skyhorsemanpower.chatService.chat.data.dto.ChatRoomMemberResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.UnReadChatCountResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.UpdateProfileImageRequestDto;
import com.skyhorsemanpower.chatService.chat.data.dto.ChatRoomTitleResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.LeaveChatRoomDto;
Expand Down Expand Up @@ -395,4 +396,19 @@ public List<ChatRoomMemberResponseDto> getChatRoomMembers(String roomNumber) {
}
}

@Override
public UnReadChatCountResponseDto getUnreadChatCount(String roomNumber, String uuid) {
ChatRoomMember chatRoomMember = chatRoomMemberRepository
.findByMemberUuidAndRoomNumber(uuid, roomNumber)
.orElseThrow(() -> new CustomException(ResponseStatus.WRONG_CHATROOM_AND_MEMBER));
// 해당 채팅방에서 uuid의 lastReadTime 이후의 채팅 개수
Long count = mongoTemplate.count(
Query.query(
Criteria.where("roomNumber").is(roomNumber).and("createdAt")
.gt(chatRoomMember.getLastReadTime())), "chat");
return UnReadChatCountResponseDto.builder()
.count(count)
.build();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.skyhorsemanpower.chatService.chat.data.dto;

import com.skyhorsemanpower.chatService.chat.data.vo.UnReadChatCountResponseVo;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class UnReadChatCountResponseDto {
Long count;

public static UnReadChatCountResponseVo dtoToVo(UnReadChatCountResponseDto unReadChatCountResponseDto) {
return UnReadChatCountResponseVo.builder()
.count(unReadChatCountResponseDto.getCount())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.skyhorsemanpower.chatService.chat.data.vo;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class UnReadChatCountResponseVo {
private Long count;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.skyhorsemanpower.chatService.chat.data.dto.ChatRoomTitleResponseDto;
import com.skyhorsemanpower.chatService.chat.data.dto.LeaveChatRoomDto;
import com.skyhorsemanpower.chatService.chat.data.dto.SendChatRequestDto;
import com.skyhorsemanpower.chatService.chat.data.dto.UnReadChatCountResponseDto;
import com.skyhorsemanpower.chatService.chat.data.vo.ChatRoomMemberResponseVo;
import com.skyhorsemanpower.chatService.chat.data.vo.ChatRoomResponseVo;
import com.skyhorsemanpower.chatService.chat.data.vo.ChatRoomTitleResponseVo;
Expand All @@ -13,6 +14,7 @@
import com.skyhorsemanpower.chatService.chat.data.vo.LeaveChatRoomRequestVo;
import com.skyhorsemanpower.chatService.chat.data.vo.PreviousChatResponseVo;
import com.skyhorsemanpower.chatService.chat.data.vo.SendChatRequestVo;
import com.skyhorsemanpower.chatService.chat.data.vo.UnReadChatCountResponseVo;
import com.skyhorsemanpower.chatService.common.SuccessResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand Down Expand Up @@ -141,12 +143,22 @@ public SuccessResponse<ChatRoomTitleResponseVo> chatRoomTitle(

@GetMapping(value = "/roomNumber/{roomNumber}/member")
@Operation(summary = "채팅방 멤버 목록", description = "채팅방 내에서 채팅방 멤버들을 표시합니다")
public SuccessResponse<List<ChatRoomMemberResponseVo>> chatRoomMembers(@PathVariable(value = "roomNumber") String roomNumber) {
List<ChatRoomMemberResponseDto> chatRoomMemberResponseDtos = chatService.getChatRoomMembers(roomNumber);
public SuccessResponse<List<ChatRoomMemberResponseVo>> chatRoomMembers(
@PathVariable(value = "roomNumber") String roomNumber) {
List<ChatRoomMemberResponseDto> chatRoomMemberResponseDtos = chatService.getChatRoomMembers(
roomNumber);
List<ChatRoomMemberResponseVo> chatRoomMemberResponseVos = chatRoomMemberResponseDtos.stream()
.map(ChatRoomMemberResponseDto::dtoToVo)
.toList();
return new SuccessResponse<>(chatRoomMemberResponseVos);
}

@GetMapping(value = "/roomNumber/{roomNumber}/unread")
@Operation(summary = "안 읽은 채팅 개수", description = "채팅 리스트에서 안 읽은 채팅 개수 최초 조회")
public SuccessResponse<UnReadChatCountResponseVo> countUnreadChats(
@PathVariable(value = "roomNumber") String roomNumber,
@RequestHeader String uuid) {
return new SuccessResponse<>(UnReadChatCountResponseDto.dtoToVo(chatService
.getUnreadChatCount(roomNumber, uuid)));
}
}
Loading