Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.List;
import java.util.Objects;

Expand Down Expand Up @@ -93,23 +96,40 @@ public void esBulkService() throws IOException {
* @return ν•΄λ‹Ή μ„Ήμ…˜μ˜ λ‰΄μŠ€ DTO 리슀트
*/
private List<NewsItemDTO> loadNewsFromDB(String section) {
// ν˜„μž¬ μ‹œκ°„ κΈ°μ€€μœΌλ‘œ μ–΄μ œμ˜ μ‹œμž‘κ³Ό 끝을 계산
LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul"));
LocalDateTime startOfYesterday = today.minusDays(1).atStartOfDay();
LocalDateTime endOfYesterday = today.atStartOfDay();
//FIXME : AWS RDS와 μ‹œκ°„λŒ€ 차이둜 μž„μ‹œλ‘œ μ„œλ²„μΈ‘μ—μ„œ μ‹œκ°„λŒ€λ₯Ό μ‘°μ ˆν•˜μ˜€μŒ. μ„€μ • 문제둜 μΈν•œ μˆ˜μ •μ΄λ‹ˆ ν•΄κ²°λ˜λ©΄ μˆ˜μ •ν•  것.
String sql = """
SELECT *
FROM news
WHERE published_at >= CURDATE() - INTERVAL 1 DAY
AND published_at < CURDATE()
AND sections = ?
""";
SELECT *
FROM news
WHERE published_at >= ?
AND published_at < ?
AND sections = ?
""";

return jdbcTemplate.query(sql, new Object[]{section}, (rs, rowNum) -> new NewsItemDTO(
String.valueOf(rs.getLong("id")),
List.of(rs.getString("sections")),
rs.getString("title"),
rs.getString("publisher"),
rs.getString("summary"),
rs.getString("content_url"),
rs.getTimestamp("published_at").toLocalDateTime()
));
// String sql = """
// SELECT *
// FROM news
// WHERE published_at >= CURDATE() - INTERVAL 1 DAY
// AND published_at < CURDATE()
// AND sections = ?
// """;

return jdbcTemplate.query(
sql,
new Object[]{Timestamp.valueOf(startOfYesterday), Timestamp.valueOf(endOfYesterday), section},
(rs, rowNum) -> new NewsItemDTO(
String.valueOf(rs.getLong("id")),
List.of(rs.getString("sections")),
rs.getString("title"),
rs.getString("publisher"),
rs.getString("summary"),
rs.getString("content_url"),
rs.getTimestamp("published_at").toLocalDateTime()
)
);
}

/**
Expand Down