|
|
@@ -1,31 +1,32 @@
|
|
|
package cn.seecoder.seecoderportalserver.service;
|
|
|
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.MessageVO;
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.ObjectState;
|
|
|
-import cn.seecoder.seecoderportalcommon.vo.ObjectType;
|
|
|
-import cn.seecoder.seecoderportalserver.domain.Announcement;
|
|
|
-import cn.seecoder.seecoderportalserver.domain.Course;
|
|
|
-import cn.seecoder.seecoderportalserver.domain.Message;
|
|
|
-import cn.seecoder.seecoderportalserver.domain.User;
|
|
|
+import cn.seecoder.seecoderportalcommon.vo.*;
|
|
|
+import cn.seecoder.seecoderportalcommon.vo.dto.CourseMessageDTO;
|
|
|
+import cn.seecoder.seecoderportalserver.domain.*;
|
|
|
import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
|
|
|
+import cn.seecoder.seecoderportalserver.repository.MessageRecordRepository;
|
|
|
import cn.seecoder.seecoderportalserver.repository.MessageRepository;
|
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.Optional;
|
|
|
+import java.time.OffsetDateTime;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
public class MessageService {
|
|
|
private final MessageRepository messageRepository;
|
|
|
+ private final MessageRecordRepository messageRecordRepository;
|
|
|
private final MessageMapper messageMapper;
|
|
|
private final UserService userService;
|
|
|
private final AnnouncementService announcementService;
|
|
|
private final CourseService courseService;
|
|
|
|
|
|
|
|
|
- public MessageService(MessageRepository messageRepository, MessageMapper messageMapper, UserService userService, AnnouncementService announcementService, CourseService courseService) {
|
|
|
+ public MessageService(MessageRepository messageRepository, MessageRecordRepository messageRecordRepository, MessageMapper messageMapper, UserService userService, AnnouncementService announcementService, CourseService courseService) {
|
|
|
this.messageRepository = messageRepository;
|
|
|
+ this.messageRecordRepository = messageRecordRepository;
|
|
|
this.messageMapper = messageMapper;
|
|
|
this.userService = userService;
|
|
|
this.announcementService = announcementService;
|
|
|
@@ -50,12 +51,12 @@ public class MessageService {
|
|
|
}
|
|
|
|
|
|
public MessageVO create(MessageVO messageVO, Long userId) {
|
|
|
- if(!messageVO.getSender().getId().equals(userId)){
|
|
|
+ if (!messageVO.getSender().getId().equals(userId)) {
|
|
|
throw new CustomErrorException("当前用户无权创建消息");
|
|
|
}
|
|
|
- try{
|
|
|
+ try {
|
|
|
this.verifyTarget(messageVO.getTargetType(), messageVO.getTargetId());
|
|
|
- }catch (CustomErrorException e){
|
|
|
+ } catch (CustomErrorException e) {
|
|
|
throw CustomErrorException.messageTargetNotFound();
|
|
|
}
|
|
|
Message message = messageMapper.toMessage(messageVO);
|
|
|
@@ -76,9 +77,9 @@ public class MessageService {
|
|
|
|
|
|
public MessageVO update(MessageVO messageVO) {
|
|
|
MessageVO originalMessage = this.getMessageById(messageVO.getId());
|
|
|
- try{
|
|
|
+ try {
|
|
|
this.verifyTarget(messageVO.getTargetType(), messageVO.getTargetId());
|
|
|
- }catch (CustomErrorException e){
|
|
|
+ } catch (CustomErrorException e) {
|
|
|
throw CustomErrorException.messageTargetNotFound();
|
|
|
}
|
|
|
if (!originalMessage.getSender().getId().equals(messageVO.getSender().getId())) {
|
|
|
@@ -92,4 +93,56 @@ public class MessageService {
|
|
|
Message message = messageRepository.findById(id).orElseThrow(CustomErrorException::messageNotFound);
|
|
|
return messageMapper.toMessageVO(message);
|
|
|
}
|
|
|
+
|
|
|
+ public List<MessageVO> getUnreadMessagesByUserId(Long userId, Integer dayRange) {
|
|
|
+ OffsetDateTime startTime = OffsetDateTime.now().minusDays(dayRange);
|
|
|
+ List<MessageVO> result = new ArrayList<>();
|
|
|
+ for (Message message : messageRepository.findMessagesBySenderIdAndStateNot(userId, ObjectState.DELETED)) {
|
|
|
+ result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(message.getId(), startTime.minusDays(dayRange), 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)
|
|
|
+ .stream()
|
|
|
+ .map(messageMapper::toMessageVO)
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ for (AnnouncementVO announcementVO : announcementService.getAnnouncementsByUserId(userId)) {
|
|
|
+ result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(announcementVO.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
|
|
|
+ .stream()
|
|
|
+ .map(messageMapper::toMessageVO)
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ result.stream()
|
|
|
+ .filter(messageVO -> {
|
|
|
+ MessageRecord record = messageRecordRepository.findById(new MessageRecordKey(messageVO.getId(), userId)).orElse(null);
|
|
|
+ if (record == null) {
|
|
|
+ messageRecordRepository.save(new MessageRecord(messageVO.getId(), userId, OffsetDateTime.now(), false, null));
|
|
|
+ return true;
|
|
|
+ } else {
|
|
|
+ return !record.getState();
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ public List<CourseMessageDTO> getMessagesByCourseId(Long courseId, Long userId) {
|
|
|
+ List<CourseMessageDTO> result = messageRepository.findMessagesByMntIdAndStateNot(courseId, 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)
|
|
|
+ .stream()
|
|
|
+ .map(messageMapper::toMessageVO)
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+ }
|
|
|
}
|