This should fix the slowness in /discal

DreamExposure · Mar 25, 2024 · 4c3f0ca · 4c3f0ca
1 parent 9538fd4
commit 4c3f0ca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/business/AnnouncementService.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/business/AnnouncementService.kt
@@ -63,7 +63,7 @@ class AnnouncementService(
         return saved
     }
 
-    suspend fun getAnnouncementCount(): Long = announcementRepository.count().awaitSingle()
+    suspend fun getAnnouncementCount(): Long = announcementRepository.countAll().awaitSingle()
 
     suspend fun getAllAnnouncements(shardIndex: Int, shardCount: Int): List<Announcement> {
         return announcementRepository.findAllByShardIndexAndEnabledIsTrue(shardCount, shardIndex)

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/business/CalendarService.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/business/CalendarService.kt
@@ -15,7 +15,7 @@ class CalendarService(
     private val calendarRepository: CalendarRepository,
     private val calendarCache: CalendarCache,
 ) {
-    suspend fun getCalendarCount(): Long = calendarRepository.count().awaitSingle()
+    suspend fun getCalendarCount(): Long = calendarRepository.countAll().awaitSingle()
 
     suspend fun getAllCalendars(guildId: Snowflake): List<Calendar> {
         var calendars = calendarCache.get(key = guildId)?.toList()

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/database/AnnouncementRepository.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/database/AnnouncementRepository.kt
@@ -7,6 +7,9 @@ import reactor.core.publisher.Mono
 
 interface AnnouncementRepository: R2dbcRepository<AnnouncementData, String> {
 
+    @Query("SELECT COUNT(*) FROM announcements")
+    fun countAll(): Mono<Long>
+
     fun findByGuildIdAndAnnouncementId(guildId: Long, announcementId: String): Mono<AnnouncementData>
 
     fun findAllByGuildId(guildId: Long): Flux<AnnouncementData>

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/database/CalendarRepository.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/database/CalendarRepository.kt
@@ -7,6 +7,9 @@ import reactor.core.publisher.Mono
 
 interface CalendarRepository : R2dbcRepository<CalendarData, Long> {
 
+    @Query("SELECT COUNT(*) FROM calendars")
+    fun countAll(): Mono<Long>
+
     fun findAllByGuildId(guildId: Long): Flux<CalendarData>
 
     fun findByGuildIdAndCalendarNumber(guildId: Long, calendarNumber: Int): Mono<CalendarData>
@@ -37,7 +40,4 @@ interface CalendarRepository : R2dbcRepository<CalendarData, Long> {
         refreshToken: String,
         expiresAt: Long,
     ): Mono<Int>
-
-    @Query(" SELECT 1")
-    fun healthCheck(): Mono<Int>
 }