mjh 4 years ago
parent
commit
0961b264af

+ 5 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/MessageRepository.java

@@ -2,6 +2,7 @@ package cn.seecoder.seecoderportalserver.repository;
 
 import cn.seecoder.seecoderportalcommon.vo.ActionType;
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import cn.seecoder.seecoderportalcommon.vo.ObjectType;
 import cn.seecoder.seecoderportalserver.domain.Message;
 import org.springframework.data.jpa.repository.JpaRepository;
 
@@ -11,7 +12,10 @@ import java.util.List;
 import java.util.Optional;
 
 public interface MessageRepository extends JpaRepository<Message, Long> {
-    List<Message> findMessagesByMntIdAndActionTypeIsAndStateNot(@NotNull Long mntId, @NotNull ActionType actionType, @NotNull ObjectState state);
+    List<Message> findMessagesByMntIdAndActionTypeIsAndTargetTypeIsAndStateNot(@NotNull Long mntId,
+                                                                               @NotNull ActionType actionType,
+                                                                               @NotNull ObjectType targetType,
+                                                                               @NotNull ObjectState state);
 
     List<Message> findMessagesBySenderIdAndStateNot(@NotNull Long senderId, @NotNull ObjectState state);
 

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

@@ -132,14 +132,14 @@ public class MessageService {
         return result;
     }
 
-    public List<CourseMessageDTO> getMessagesByCourseId(Long courseId, Long userId) {
-        List<CourseMessageDTO> result = messageRepository.findMessagesByMntIdAndActionTypeIsAndStateNot(courseId, ActionType.COMMENT, ObjectState.DELETED)
+    public List<CourseMessageDTO> getMessagesByCourseId(Long courseId) {
+        List<CourseMessageDTO> result = messageRepository.findMessagesByMntIdAndActionTypeIsAndTargetTypeIsAndStateNot(courseId, ActionType.COMMENT, ObjectType.COURSE, ObjectState.DELETED)
                 .stream()
                 .map(message -> new CourseMessageDTO(messageMapper.toMessageVO(message)))
                 .collect(Collectors.toList());
         for (CourseMessageDTO courseMessageDTO : result) {
             courseMessageDTO.setChildren(
-                    messageRepository.findMessagesByMntIdAndActionTypeIsAndStateNot(courseMessageDTO.getMainMessage().getId(), ActionType.COMMENT, ObjectState.DELETED)
+                    messageRepository.findMessagesByMntIdAndActionTypeIsAndTargetTypeIsAndStateNot(courseMessageDTO.getMainMessage().getId(), ActionType.COMMENT, ObjectType.COURSE, ObjectState.DELETED)
                             .stream()
                             .map(messageMapper::toMessageVO)
                             .collect(Collectors.toList()));

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

@@ -45,6 +45,6 @@ public class MessageController {
 
     @GetMapping("/getByCourseId")
     public OkResponse<List<CourseMessageDTO>> getMessagesByCourse(@RequestParam Long courseId){
-        return OkResponse.of(messageService.getMessagesByCourseId(courseId, SecurityUtils.getCurrentUser().getId()));
+        return OkResponse.of(messageService.getMessagesByCourseId(courseId));
     }
 }