Skip to content
Merged
Show file tree
Hide file tree
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 @@ -11,7 +11,8 @@ import java.time.Instant
@Entity
@Table(
indexes = [
Index(name = "idx_user_id_visited_at", columnList = "user_id, visited_at")
Index(name = "idx_user_id_visited_at", columnList = "user_id, visited_at"),
Index(name = "idx_user_id_closed_at", columnList = "user_id, closed_at")
]
)
class History(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ interface HistoryRepository : JpaRepository<History, Long> {
JOIN website w ON w.id = h.website_id
LEFT JOIN website_category wc ON wc.id = w.category_id
WHERE h.user_id = :userId
AND h.visited_at BETWEEN DATE_SUB(:startedAt, INTERVAL 1 DAY) AND :endedAt
AND h.closed_at BETWEEN :startedAt AND DATE_ADD(:endedAt, INTERVAL 1 DAY)
GROUP BY h.website_id, w.domain, w.favicon_url, wc.name
AND h.visited_at < :endedAt
AND h.closed_at > :startedAt
GROUP BY h.website_id
ORDER BY stayDuration DESC
""",
nativeQuery = true
Expand Down