|
|
@@ -94,30 +94,31 @@ public class MessageService {
|
|
|
return messageMapper.toMessageVO(message);
|
|
|
}
|
|
|
|
|
|
- public List<MessageVO> getUnreadMessagesByUserId(Long userId, Integer dayRange) {
|
|
|
- OffsetDateTime startTime = OffsetDateTime.now().minusDays(dayRange);
|
|
|
+ public List<MessageVO> getUnreadMessagesByUserId(Long userId, int period) {
|
|
|
+ OffsetDateTime endTime = OffsetDateTime.now().minusDays(period * 3L);
|
|
|
+ OffsetDateTime startTime = OffsetDateTime.now().minusDays((period + 1) * 3L);
|
|
|
List<MessageVO> result = new ArrayList<>();
|
|
|
for (Message message : messageRepository.findMessagesBySenderIdAndStateNot(userId, ObjectState.DELETED)) {
|
|
|
- result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(message.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
|
|
|
+ result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsBetweenAndStateNot(message.getId(), startTime, endTime, ObjectState.DELETED)
|
|
|
.stream()
|
|
|
.map(messageMapper::toMessageVO)
|
|
|
.collect(Collectors.toList()));
|
|
|
}
|
|
|
if (userService.isTeacher(userService.findUserById(userId).getRole())) {
|
|
|
for (CourseVO courseVO : courseService.getTeacherCourses(userId)) {
|
|
|
- result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(courseVO.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
|
|
|
+ result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsBetweenAndStateNot(courseVO.getId(), startTime, endTime, ObjectState.DELETED)
|
|
|
.stream()
|
|
|
.map(messageMapper::toMessageVO)
|
|
|
.collect(Collectors.toList()));
|
|
|
}
|
|
|
for (AnnouncementVO announcementVO : announcementService.getAnnouncementsByUserId(userId)) {
|
|
|
- result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(announcementVO.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
|
|
|
+ result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsBetweenAndStateNot(announcementVO.getId(), startTime, endTime, ObjectState.DELETED)
|
|
|
.stream()
|
|
|
.map(messageMapper::toMessageVO)
|
|
|
.collect(Collectors.toList()));
|
|
|
}
|
|
|
}
|
|
|
- result.stream()
|
|
|
+ result = result.stream()
|
|
|
.filter(messageVO -> {
|
|
|
MessageRecord record = messageRecordRepository.findById(new MessageRecordKey(messageVO.getId(), userId)).orElse(null);
|
|
|
if (record == null) {
|
|
|
@@ -132,13 +133,13 @@ public class MessageService {
|
|
|
}
|
|
|
|
|
|
public List<CourseMessageDTO> getMessagesByCourseId(Long courseId, Long userId) {
|
|
|
- List<CourseMessageDTO> result = messageRepository.findMessagesByMntIdAndStateNot(courseId, ObjectState.DELETED)
|
|
|
+ List<CourseMessageDTO> result = messageRepository.findMessagesByMntIdAndActionTypeIsAndStateNot(courseId, ActionType.COMMENT, ObjectState.DELETED)
|
|
|
.stream()
|
|
|
.map(message -> new CourseMessageDTO(messageMapper.toMessageVO(message)))
|
|
|
.collect(Collectors.toList());
|
|
|
for (CourseMessageDTO courseMessageDTO : result) {
|
|
|
courseMessageDTO.setChildren(
|
|
|
- messageRepository.findMessagesByMntIdAndStateNot(courseMessageDTO.getMainMessage().getId(), ObjectState.DELETED)
|
|
|
+ messageRepository.findMessagesByMntIdAndActionTypeIsAndStateNot(courseMessageDTO.getMainMessage().getId(), ActionType.COMMENT, ObjectState.DELETED)
|
|
|
.stream()
|
|
|
.map(messageMapper::toMessageVO)
|
|
|
.collect(Collectors.toList()));
|