Skip to content

Commit

Permalink
chore: cache default requests
Browse files Browse the repository at this point in the history
  • Loading branch information
NilsOveTen committed Oct 9, 2024
1 parent bb95e18 commit 865bb65
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/main/kotlin/no/digdir/fdk/statistics/Scheduler.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ open class Scheduler(private val statisticsService: StatisticsService) {
)
)

log.info("Calculation done, clearing time-series cache")
log.info("Calculation done, clearing time-series cache and init with default requests")

Check warning on line 33 in src/main/kotlin/no/digdir/fdk/statistics/Scheduler.kt

View check run for this annotation

Codecov / codecov/patch

src/main/kotlin/no/digdir/fdk/statistics/Scheduler.kt#L33

Added line #L33 was not covered by tests
statisticsService.clearTimeSeriesCache()
statisticsService.cacheDefaultRequests()

Check warning on line 35 in src/main/kotlin/no/digdir/fdk/statistics/Scheduler.kt

View check run for this annotation

Codecov / codecov/patch

src/main/kotlin/no/digdir/fdk/statistics/Scheduler.kt#L35

Added line #L35 was not covered by tests
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@ import no.digdir.fdk.statistics.model.Event
import no.digdir.fdk.statistics.model.InformationModel
import no.digdir.fdk.statistics.model.LatestForDate
import no.digdir.fdk.statistics.model.CalculationRequest
import no.digdir.fdk.statistics.model.Interval
import no.digdir.fdk.statistics.model.ResourceType
import no.digdir.fdk.statistics.model.Service
import no.digdir.fdk.statistics.model.ResourceEventMetrics
import no.digdir.fdk.statistics.model.SearchFilter
import no.digdir.fdk.statistics.model.TimeSeriesFilters
import no.digdir.fdk.statistics.model.TimeSeriesPoint
import no.digdir.fdk.statistics.model.TimeSeriesRequest
import no.digdir.fdk.statistics.repository.StatisticsRepository
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.boot.context.event.ApplicationReadyEvent
import org.springframework.context.event.EventListener
import org.springframework.stereotype.Component
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.ZoneOffset

@Component
Expand Down Expand Up @@ -153,4 +159,84 @@ class StatisticsService(private val statisticsRepository: StatisticsRepository)
return statisticsRepository.timeSeries(req)
}

/**
* Run on startup
*/
@EventListener
private fun initCache(event: ApplicationReadyEvent) =
cacheDefaultRequests()

fun cacheDefaultRequests() {
logger.info("Cache default requests")

val firstOfThisMonth = LocalDate.now().withDayOfMonth(1).toString()
val conceptStart = "2023-02-01"
val dataServiceStart = "2023-02-01"
val datasetStart = "2022-11-01"
val infoModelStart = "2024-01-01"

val conceptReq = TimeSeriesRequest(
start = conceptStart,
end = firstOfThisMonth,
interval = Interval.MONTH,
filters = TimeSeriesFilters(
resourceType = SearchFilter(value = ResourceType.CONCEPT),
orgPath = null,
transport = null
)
)

statisticsRepository.timeSeries(conceptReq)
statisticsRepository.timeSeries(conceptReq.addTransportFilter())

val dataServiceReq = TimeSeriesRequest(
start = dataServiceStart,
end = firstOfThisMonth,
interval = Interval.MONTH,
filters = TimeSeriesFilters(
resourceType = SearchFilter(value = ResourceType.DATA_SERVICE),
orgPath = null,
transport = null
)
)

statisticsRepository.timeSeries(dataServiceReq)
statisticsRepository.timeSeries(dataServiceReq.addTransportFilter())

val datasetReq = TimeSeriesRequest(
start = datasetStart,
end = firstOfThisMonth,
interval = Interval.MONTH,
filters = TimeSeriesFilters(
resourceType = SearchFilter(value = ResourceType.DATASET),
orgPath = null,
transport = null
)
)

statisticsRepository.timeSeries(datasetReq)
statisticsRepository.timeSeries(datasetReq.addTransportFilter())

val infoModelReq = TimeSeriesRequest(
start = infoModelStart,
end = firstOfThisMonth,
interval = Interval.MONTH,
filters = TimeSeriesFilters(
resourceType = SearchFilter(value = ResourceType.INFORMATION_MODEL),
orgPath = null,
transport = null
)
)

statisticsRepository.timeSeries(infoModelReq)
statisticsRepository.timeSeries(infoModelReq.addTransportFilter())
}

private fun TimeSeriesRequest.addTransportFilter() =
copy(
filters = filters?.copy(
transport = SearchFilter(value = true)
)
)

}

0 comments on commit 865bb65

Please sign in to comment.