Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] 전체공지, 총학생회공지, 퀵스캔 스토리 수정 #55 #57

Merged
merged 1 commit into from
Jul 15, 2024
Merged

[FIX] 전체공지, 총학생회공지, 퀵스캔 스토리 수정 #55 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/sopt/univoice/domain/notice/controller/NoticeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public ResponseEntity<SuccessStatusResponse<Object>> quickhead() {

@GetMapping("/all")
public ResponseEntity<SuccessStatusResponse<Object>> getAllNoticeByUserUniversity() {
List<NoticeDTO> response = noticeService.getAllNoticeByUserUniversity();
List<NoticeResponseDTO> response = noticeService.getAllNoticeByUserUniversity();
return ResponseEntity.status(HttpStatus.OK)
.body(SuccessStatusResponse.of(SuccessMessage.GET_ALL_NOTICE_SUCCESS, response));
}
Expand Down
129 changes: 59 additions & 70 deletions src/main/java/sopt/univoice/domain/notice/service/NoticeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ public QuickScanDTO quickhead() {
String departmentName = member.getDepartmentName();

List<Notice> universityNotices = noticeRepository.findByMemberUniversityNameAndAffiliationAffiliation(universityName, "총학생회");
List<Notice> collegeNotices = noticeRepository.findByMemberUniversityNameAndAffiliationAffiliation(universityName, "단과대학학생회");
List<Notice> departmentNotices = noticeRepository.findByMemberUniversityNameAndAffiliationAffiliation(universityName, "과학생회");
List<Notice> collegeNotices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, "단과대학학생회");
List<Notice> departmentNotices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, departmentName, "과학생회");

String universityLogoImage = null;
String collegeDepartmentLogoImage = null;
Expand All @@ -367,111 +367,100 @@ public QuickScanDTO quickhead() {
departmentLogoImage = departmentAffiliation.getAffiliationLogoImage();
}

LocalDateTime now = LocalDateTime.now();

List<Notice> filteredUniversityNotices = new ArrayList<>();
// 읽지 않은 총학생회 공지 필터링 및 카운트
int universityNameCount = 0;
for (Notice notice : universityNotices) {
if (notice.getCreatedAt().isAfter(now.minus(7, ChronoUnit.DAYS))) {
for (NoticeView noticeView : notice.getNoticeViews()) {
if (noticeView.getMember().getId().equals(memberId) && !noticeView.isReadAt()) {
filteredUniversityNotices.add(notice);
break;
}
for (NoticeView noticeView : notice.getNoticeViews()) {
if (noticeView.getMember().getId().equals(memberId) && !noticeView.isReadAt()) {
universityNameCount++;
break;
}
}
}

List<Notice> filteredCollegeNotices = new ArrayList<>();
// 읽지 않은 단과대학 공지 필터링 및 카운트
int collegeDepartmentCount = 0;
for (Notice notice : collegeNotices) {
if (notice.getCreatedAt().isAfter(now.minus(7, ChronoUnit.DAYS))) {
for (NoticeView noticeView : notice.getNoticeViews()) {
if (noticeView.getMember().getId().equals(memberId) && !noticeView.isReadAt()) {
filteredCollegeNotices.add(notice);
break;
}
for (NoticeView noticeView : notice.getNoticeViews()) {
if (noticeView.getMember().getId().equals(memberId) && !noticeView.isReadAt()) {
collegeDepartmentCount++;
break;
}
}
}

List<Notice> filteredDepartmentNotices = new ArrayList<>();
// 읽지 않은 학과 공지 필터링 및 카운트
int departmentCount = 0;
for (Notice notice : departmentNotices) {
if (notice.getCreatedAt().isAfter(now.minus(7, ChronoUnit.DAYS))) {
for (NoticeView noticeView : notice.getNoticeViews()) {
if (noticeView.getMember().getId().equals(memberId) && !noticeView.isReadAt()) {
filteredDepartmentNotices.add(notice);
break;
}
for (NoticeView noticeView : notice.getNoticeViews()) {
if (noticeView.getMember().getId().equals(memberId) && !noticeView.isReadAt()) {
departmentCount++;
break;
}
}
}

// 공지사항 필터링
int universityNameCount = filteredUniversityNotices.size();
int collegeDepartmentCount = filteredCollegeNotices.size();
int departmentCount = filteredDepartmentNotices.size();

QuickScanDTO quickScans = new QuickScanDTO(
universityName + " 총학생회", universityNameCount, universityLogoImage,
collegeDepartmentName + " 학생회", collegeDepartmentCount, collegeDepartmentLogoImage,
departmentName + " 학생회", departmentCount, departmentLogoImage
);

List<Notice> notices = noticeRepository.findAllByMemberUniversityName(universityName);

List<NoticeDTO> noticeDTOs = new ArrayList<>();
for (Notice notice : notices) {
String image = notice.getNoticeImages().isEmpty() ? null : notice.getNoticeImages().get(0).getNoticeImage();
NoticeDTO noticeDTO = new NoticeDTO(
notice.getId(),
notice.getStartTime(),
notice.getEndTime(),
notice.getTitle(),
notice.getNoticeLike(),
notice.getViewCount(),
notice.getCategory().toString(), // assuming category is an enum or string
notice.getCreatedAt(),
image
);
noticeDTOs.add(noticeDTO);
}

return quickScans;
}

@Transactional
public List<NoticeDTO> getAllNoticeByUserUniversity() {
public List<NoticeResponseDTO> getAllNoticeByUserUniversity() {
Long memberId = principalHandler.getUserIdFromPrincipal();

Member member = authRepository.findById(memberId)
.orElseThrow(() -> new RuntimeException("회원이 존재하지 않습니다."));

String universityName = member.getUniversityName();
List<Notice> notices = noticeRepository.findAllByMemberUniversityName(universityName);
String collegeDepartmentName = member.getCollegeDepartmentName();
String departmentName = member.getDepartmentName();

// 총학생회 공지 조회
List<Notice> universityNotices = noticeRepository.findByMemberUniversityNameAndMemberAffiliationAffiliation(universityName, "총학생회");

// 단과대학 공지 조회
List<Notice> collegeDepartmentNotices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, "단과대학학생회");

// 학과 공지 조회
List<Notice> departmentNotices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, departmentName, "과학생회");

List<Notice> allNotices = new ArrayList<>();
allNotices.addAll(universityNotices);
allNotices.addAll(collegeDepartmentNotices);
allNotices.addAll(departmentNotices);

// 최신순 정렬
notices.sort(Comparator.comparing(Notice::getCreatedAt).reversed());
allNotices.sort(Comparator.comparing(Notice::getCreatedAt).reversed());

// NoticeResponseDTO 리스트로 변환
List<NoticeResponseDTO> noticeResponseDTOs = allNotices.stream()
.map(notice -> {
String image = notice.getNoticeImages().isEmpty() ? null : notice.getNoticeImages().get(0).getNoticeImage();
return new NoticeResponseDTO(
notice.getId(),
notice.getStartTime(),
notice.getEndTime(),
notice.getTitle(),
notice.getNoticeLike(),
notice.getViewCount(),
notice.getCategory(),
notice.getCreatedAt(),
image // 이미지 추가
);
}).collect(Collectors.toList());

List<NoticeDTO> noticeDTOs = new ArrayList<>();
for (Notice notice : notices) {
String image = notice.getNoticeImages().isEmpty() ? null : notice.getNoticeImages().get(0).getNoticeImage();
NoticeDTO noticeDTO = new NoticeDTO(
notice.getId(),
notice.getStartTime(),
notice.getEndTime(),
notice.getTitle(),
notice.getNoticeLike(),
notice.getViewCount(),
notice.getCategory().toString(), // assuming category is an enum or string
notice.getCreatedAt(),
image // 이미지 추가
);
noticeDTOs.add(noticeDTO);
}
return noticeDTOs;
return noticeResponseDTOs;
}

@Transactional
public List<NoticeDTO> getUniversityNoticeByUserUniversity() {
Long memberId = principalHandler.getUserIdFromPrincipal();

Member member = authRepository.findById(memberId)
.orElseThrow(() -> new RuntimeException("회원이 존재하지 않습니다."));

Expand All @@ -492,7 +481,7 @@ public List<NoticeDTO> getUniversityNoticeByUserUniversity() {
notice.getTitle(),
notice.getNoticeLike(),
notice.getViewCount(), // 조회수로 수정
notice.getCategory().toString(),// assuming category is an enum or string
notice.getCategory(),
notice.getCreatedAt(),
image // 이미지 추가
);
Expand Down
Loading