Skip to content

Commit

Permalink
[FIX] 띄어쓰기 수정 및 affiliation 글자 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@eeddiinn
eeddiinn committed Jul 16, 2024
1 parent e98f14b commit 4189c4d
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions src/main/java/sopt/univoice/domain/notice/service/NoticeService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,12 @@ public List<QuickQueryNoticeDTO> getQuickNoticeByUserUniversity(String affiliati
String departmentName = member.getDepartmentName();

List<Notice> notices;
if ("총학생회".equals(affiliation)) {
notices = noticeRepository.findByMemberUniversityNameAndMemberAffiliationAffiliation(universityName, "총학생회");
} else if ("단과대학학생회".equals(affiliation)) {
notices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, "단과대학학생회");
} else if ("과학생회".equals(affiliation)) {
notices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, departmentName, "과학생회");
if ("총 학생회".equals(affiliation)) {
notices = noticeRepository.findByMemberUniversityNameAndMemberAffiliationAffiliation(universityName, "총 학생회");
} else if ("단과대학 학생회".equals(affiliation)) {
notices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, "단과대학 학생회");
} else if ("학과 학생회".equals(affiliation)) {
notices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, departmentName, "학과 학생회");
} else {
throw new IllegalArgumentException("Invalid affiliation");
}
Expand All @@ -306,11 +306,11 @@ public List<QuickQueryNoticeDTO> getQuickNoticeByUserUniversity(String affiliati

return filteredNotices.stream().map(notice -> {
String writeAffiliation = "";
if ("총학생회".equals(affiliation)) {
if ("총 학생회".equals(affiliation)) {
writeAffiliation = member.getUniversityName() + " 총학생회";
} else if ("단과대학학생회".equals(affiliation)) {
} else if ("단과대학 학생회".equals(affiliation)) {
writeAffiliation = member.getCollegeDepartmentName() + " 학생회";
} else if ("과학생회".equals(affiliation)) {
} else if ("학과 학생회".equals(affiliation)) {
writeAffiliation = member.getDepartmentName() + " 학생회";
}

Expand Down Expand Up @@ -341,9 +341,9 @@ public QuickScanDTO quickhead() {
String collegeDepartmentName = member.getCollegeDepartmentName();
String departmentName = member.getDepartmentName();

List<Notice> universityNotices = noticeRepository.findByMemberUniversityNameAndAffiliationAffiliation(universityName, "총학생회");
List<Notice> collegeNotices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, "단과대학학생회");
List<Notice> departmentNotices = noticeRepository.findByMemberUniversityNameAndMemberCollegeDepartmentNameAndMemberDepartmentNameAndMemberAffiliationAffiliation(universityName, collegeDepartmentName, departmentName, "과학생회");
List<Notice> universityNotices = 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 @@ -353,7 +353,7 @@ public QuickScanDTO quickhead() {
Affiliation universityAffiliation = universityNotices.stream()
.map(Notice::getMember)
.map(Member::getAffiliation)
.filter(a -> "총학생회".equals(a.getAffiliation()))
.filter(a -> "총 학생회".equals(a.getAffiliation()))
.findFirst()
.orElse(null);
if (universityAffiliation != null) {
Expand All @@ -364,7 +364,7 @@ public QuickScanDTO quickhead() {
Affiliation collegeAffiliation = collegeNotices.stream()
.map(Notice::getMember)
.map(Member::getAffiliation)
.filter(a -> "단과대학학생회".equals(a.getAffiliation()))
.filter(a -> "단과대학 학생회".equals(a.getAffiliation()))
.findFirst()
.orElse(null);
if (collegeAffiliation != null) {
Expand All @@ -375,7 +375,7 @@ public QuickScanDTO quickhead() {
Affiliation departmentAffiliation = departmentNotices.stream()
.map(Notice::getMember)
.map(Member::getAffiliation)
.filter(a -> "과학생회".equals(a.getAffiliation()))
.filter(a -> "학과 학생회".equals(a.getAffiliation()))
.findFirst()
.orElse(null);
if (departmentAffiliation != null) {
Expand Down Expand Up @@ -436,13 +436,13 @@ public List<NoticeResponseDTO> getAllNoticeByUserUniversity() {
String departmentName = member.getDepartmentName();

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

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

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

List<Notice> allNotices = new ArrayList<>();
allNotices.addAll(universityNotices);
Expand Down Expand Up @@ -481,7 +481,7 @@ public List<NoticeDTO> getUniversityNoticeByUserUniversity() {

String universityName = member.getUniversityName();

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

// 최신순 정렬 (즉, 제일 최근에 올린 공지가 맨 위, 전에 올렸던 공지는 아래)
universityNotices.sort(Comparator.comparing(Notice::getCreatedAt).reversed());
Expand Down Expand Up @@ -515,7 +515,7 @@ public List<NoticeResponseDTO> getCollegeDepartmentNoticeByUserUniversity() {
String universityName = member.getUniversityName();
String collegeDepartmentName = member.getCollegeDepartmentName(); // 추가된 부분

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

// 최신순 정렬
collegeDepartmentNotices.sort(Comparator.comparing(Notice::getCreatedAt).reversed());
Expand Down Expand Up @@ -548,7 +548,7 @@ public List<NoticeResponseDTO> getDepartmentNoticeByUserUniversity() {
String collegeDepartmentName = member.getCollegeDepartmentName();
String departmentName = member.getDepartmentName();

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

// 최신순 정렬
departmentNotices.sort(Comparator.comparing(Notice::getCreatedAt).reversed());
Expand Down

0 comments on commit 4189c4d

Please sign in to comment.