|
|
@@ -4,6 +4,8 @@ import cn.seecoder.seecoderportalcommon.vo.*;
|
|
|
import cn.seecoder.seecoderportalserver.domain.Announcement;
|
|
|
import cn.seecoder.seecoderportalserver.domain.AnnouncementRecord;
|
|
|
import cn.seecoder.seecoderportalserver.repository.AnnouncementRecordRepository;
|
|
|
+import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
|
|
|
+import cn.seecoder.seecoderportalserver.security.SecurityUtils;
|
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
|
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
|
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
|
|
|
@@ -70,16 +72,24 @@ public class AnnouncementService {
|
|
|
|
|
|
public AnnouncementVO getAnnouncementById(Long id) {
|
|
|
Announcement announcement = announcementRepository.findById(id).orElseThrow(CustomErrorException::announcementNotFound);
|
|
|
+ DomainUserDetails user = SecurityUtils.getCurrentUser();
|
|
|
+ AnnouncementVO result = announcementMapper.toAnnouncementVO(announcement);
|
|
|
+ result.setRead(userService.isTeacher(user.getRole()) || this.getReadState(id, user.getId()));
|
|
|
return announcementMapper.toAnnouncementVO(announcement);
|
|
|
}
|
|
|
|
|
|
public List<AnnouncementVO> getAnnouncementsByCourseId(Long courseId) {
|
|
|
courseService.getCourseById(courseId);
|
|
|
+ DomainUserDetails user = SecurityUtils.getCurrentUser();
|
|
|
List<Announcement> announcementList = announcementRepository.findAnnouncementsByCourseId(courseId);
|
|
|
- return announcementList.stream()
|
|
|
+ List<AnnouncementVO> result = announcementList.stream()
|
|
|
.filter(announcement -> announcement.getState() != ObjectState.DELETED)
|
|
|
.map(announcementMapper::toAnnouncementVO)
|
|
|
.collect(Collectors.toList());
|
|
|
+ result.forEach(announcementVO -> {
|
|
|
+ announcementVO.setRead(userService.isTeacher(user.getRole()) || this.getReadState(announcementVO.getId(), user.getId()));
|
|
|
+ });
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
public List<AnnouncementVO> getUnreadAnnouncementsByUserId(Long userId) {
|
|
|
@@ -110,7 +120,17 @@ public class AnnouncementService {
|
|
|
return announcementList.stream()
|
|
|
.map(this::getAnnouncementById)
|
|
|
.collect(Collectors.toList());
|
|
|
+ }else{
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ public Boolean getReadState(Long id, Long userId) {
|
|
|
+ AnnouncementRecord record = announcementRecordRepository.findById(new AnnouncementRecordKey(id, userId)).orElse(null);
|
|
|
+ if (record == null) {
|
|
|
+ return false;
|
|
|
+ } else {
|
|
|
+ return record.getState();
|
|
|
}
|
|
|
- return null;
|
|
|
}
|
|
|
}
|