Forráskód Böngészése

feat: 根据课程获取评论以及用户获取自己未读的消息

mjh 4 éve
szülő
commit
ce82493907

+ 7 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/MessageRepository.java

@@ -1,5 +1,6 @@
 package cn.seecoder.seecoderportalserver.repository;
 
+import cn.seecoder.seecoderportalcommon.vo.ActionType;
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalserver.domain.Message;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,11 +8,14 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import javax.validation.constraints.NotNull;
 import java.time.OffsetDateTime;
 import java.util.List;
+import java.util.Optional;
 
 public interface MessageRepository extends JpaRepository<Message, Long> {
-    List<Message> findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(@NotNull Long targetId, @NotNull OffsetDateTime createdAt, @NotNull ObjectState state);
-
-    List<Message> findMessagesByMntIdAndStateNot(@NotNull Long mntId, @NotNull ObjectState state);
+    List<Message> findMessagesByMntIdAndActionTypeIsAndStateNot(@NotNull Long mntId, @NotNull ActionType actionType, @NotNull ObjectState state);
 
     List<Message> findMessagesBySenderIdAndStateNot(@NotNull Long senderId, @NotNull ObjectState state);
+
+    List<Message> findMessagesByTargetIdAndCreatedAtIsBetweenAndStateNot(@NotNull Long targetId, @NotNull OffsetDateTime createdAt, @NotNull OffsetDateTime createdAt2, @NotNull ObjectState state);
+
+    Optional<Message> findFirstMessageByTargetIdOrderByCreatedAt(@NotNull Long targetId);
 }

+ 9 - 8
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java

@@ -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()));

+ 3 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/MessageController.java

@@ -38,9 +38,9 @@ public class MessageController {
         return OkResponse.of(messageService.getMessageById(id));
     }
 
-    @GetMapping("/getUnreadByUser")
-    public OkResponse<List<MessageVO>> getUnreadMessagesByUser(@RequestParam(defaultValue = "3") Integer day){
-        return OkResponse.of(messageService.getUnreadMessagesByUserId(SecurityUtils.getCurrentUser().getId(), day));
+    @GetMapping("/getUnread")
+    public OkResponse<List<MessageVO>> getUnreadMessagesByUser(@RequestParam(defaultValue = "0") Integer period){
+        return OkResponse.of(messageService.getUnreadMessagesByUserId(SecurityUtils.getCurrentUser().getId(), period));
     }
 
     @GetMapping("/getByCourseId")