♻️ refactor: 공고 조회, 공고 카테고리 조회 수정 (#186)

* ♻️ refactor: 공고 조회 Response에 조직 태그 추가

* ♻️ refactor: 공고 카테고리 조회 steam.sort처리 -> JPA 로 변경

src/main/java/com/sponus/sponusbe/domain/announcement/dto/response/AnnouncementDetailResponse.java

@@ -6,13 +6,14 @@
 import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementCategory;
 import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementStatus;
 import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementType;
+import com.sponus.sponusbe.domain.organization.dto.OrganizationSummaryResponse;
 
 import lombok.Builder;
 
 @Builder
 public record AnnouncementDetailResponse(
 	Long id,
-	Long writerId,
+	OrganizationSummaryResponse writer,
 	String title,
 	AnnouncementType type,
 	AnnouncementCategory category,
@@ -27,9 +28,11 @@ public static AnnouncementDetailResponse from(Announcement announcement) {
 			.map(AnnouncementImageResponse::from)
 			.toList();
 
+		OrganizationSummaryResponse writer = OrganizationSummaryResponse.from(announcement.getWriter());
+
 		return AnnouncementDetailResponse.builder()
 			.id(announcement.getId())
-			.writerId(announcement.getWriter().getId())
+			.writer(writer)
 			.title(announcement.getTitle())
 			.type(announcement.getType())
 			.category(announcement.getCategory())

src/main/java/com/sponus/sponusbe/domain/announcement/repository/AnnouncementRepository.java

@@ -16,11 +16,11 @@ public interface AnnouncementRepository extends JpaRepository<Announcement, Long
 
 	List<Announcement> findByStatus(AnnouncementStatus status);
 
-	List<Announcement> findByCategoryAndType(AnnouncementCategory category, AnnouncementType type);
+	List<Announcement> findByCategoryAndTypeOrderByCreatedAtDesc(AnnouncementCategory category, AnnouncementType type);
 
-	List<Announcement> findByCategory(AnnouncementCategory category);
+	List<Announcement> findByCategoryOrderByCreatedAtDesc(AnnouncementCategory category);
 
-	List<Announcement> findByType(AnnouncementType type);
+	List<Announcement> findByTypeOrderByCreatedAtDesc(AnnouncementType type);
 
 	@Query("SELECT a FROM Announcement a WHERE a.status='OPENED' ORDER BY a.viewCount DESC LIMIT 10")
 	List<Announcement> findTop10OrderByViewCountDesc();

src/main/java/com/sponus/sponusbe/domain/announcement/service/AnnouncementQueryService.java

@@ -37,29 +37,26 @@ public List<AnnouncementSummaryResponse> getAnnouncementByCategory(AnnouncementC
 		// 둘 다 값이 있는 경우
 		if (category != null && type != null) {
 			log.info("category & type");
-			return announcementRepository.findByCategoryAndType(category, type)
+			return announcementRepository.findByCategoryAndTypeOrderByCreatedAtDesc(category, type)
 				.stream()
 				.filter(announcement -> announcement.getStatus() == AnnouncementStatus.OPENED)
 				.map(AnnouncementSummaryResponse::from)
-				.sorted(Comparator.comparing(AnnouncementSummaryResponse::getCreatedAt).reversed())
 				.toList();
 		}
 		// category 만 있는 경우
 		else if (category != null) {
-			return announcementRepository.findByCategory(category)
+			return announcementRepository.findByCategoryOrderByCreatedAtDesc(category)
 				.stream()
 				.filter(announcement -> announcement.getStatus() == AnnouncementStatus.OPENED)
 				.map(AnnouncementSummaryResponse::from)
-				.sorted(Comparator.comparing(AnnouncementSummaryResponse::getCreatedAt).reversed())
 				.toList();
 		}
 		// type 만 있는 경우
 		else if (type != null) {
-			return announcementRepository.findByType(type)
+			return announcementRepository.findByTypeOrderByCreatedAtDesc(type)
 				.stream()
 				.filter(announcement -> announcement.getStatus() == AnnouncementStatus.OPENED)
 				.map(AnnouncementSummaryResponse::from)
-				.sorted(Comparator.comparing(AnnouncementSummaryResponse::getCreatedAt).reversed())
 				.toList();
 		}
 		// 둘 다 값이 없는 경우, 전체 announcement 반환