Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 스케줄러 시간 조절 #498

Merged
merged 3 commits into from
Oct 3, 2024
Merged

feat: 스케줄러 시간 조절 #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
565dc69
feat: 스케줄러 시간 조절
injoon2019 Oct 3, 2024
4a5d2d1
feat: 스케줄러 추가
injoon2019 Oct 3, 2024
0c6de18
feat: 테스트 계정 빼도록 수정
injoon2019 Oct 3, 2024
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
23 changes: 14 additions & 9 deletions app/src/main/kotlin/com/nexters/bottles/app/notification/component/StatisticsScheduler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.nexters.bottles.app.bottle.domain.enum.PingPongStatus
import com.nexters.bottles.app.bottle.repository.BottleRepository
import com.nexters.bottles.app.bottle.repository.LetterRepository
import com.nexters.bottles.app.user.domain.enum.Gender
import com.nexters.bottles.app.user.repository.UserProfileRepository
import com.nexters.bottles.app.user.repository.UserRepository
import mu.KotlinLogging
Expand Down Expand Up @@ -38,14 +39,12 @@ class StatisticsScheduler(
.baseUrl(slackUrl)
.build()

@Scheduled(cron = "0 0/5 * * * *")
@Scheduled(cron = "0 0 10 * * *")
fun sendDailyStatistics() {
log.info { "데일리 지표 스케줄러 돌기 시작" }
log.info { "slackUrl=$slackUrl" }
val yesterday = LocalDate.now().minusDays(1)

val allUsers = userRepository.findAll()
val currentUser = allUsers.filterNot { it.deleted }
val currentUser = allUsers.filterNot { it.deleted }.filter { it.id > 151 }
val yesterdayRegisterUser = allUsers.filter { it.createdAt.toLocalDate() == yesterday }
val yesterdayLeaveUser = allUsers.filter { it.deletedAt?.toLocalDate() == yesterday }
val yesterdayStartPingpong = bottleRepository
Expand All @@ -55,6 +54,15 @@ class StatisticsScheduler(
)
.filter { it.pingPongStatus == PingPongStatus.MATCHED }

val currentMaleUsers = allUsers.filter { it.gender == Gender.MALE }
val currentFemaleUsers = allUsers.filter { it.gender == Gender.FEMALE }

val currentIntroductionDoneMaleuser =
userProfileRepository.findAllByUserIdIn(currentMaleUsers.map { it.id }).filter { it.introduction.isNotEmpty() }

val currentIntroductionDoneFemaleuser =
userProfileRepository.findAllByUserIdIn(currentFemaleUsers.map { it.id }).filter { it.introduction.isNotEmpty() }

val request = mapOf(
"channel" to slackChannel,
"blocks" to listOf(
Expand All @@ -65,6 +73,8 @@ class StatisticsScheduler(
"text" to """
지표 물어다주는 새 :bird:
전체 유저: ${currentUser.count()} 명
자기소개 작성 남성 유저: ${currentIntroductionDoneMaleuser.count()} 명
자기소개 작성 여성 유저: ${currentIntroductionDoneFemaleuser.count()} 명
어제 가입 유저: ${yesterdayRegisterUser.count()} 명
어제 탈퇴 유저: ${yesterdayLeaveUser.count()} 명
어제 핑퐁 시작 유저: ${yesterdayStartPingpong.count()} 명
Expand All @@ -74,21 +84,16 @@ class StatisticsScheduler(
)
)

log.info { "Sending request to Slack: ${ObjectMapper().writeValueAsString(request)}" }

val response = webClient.post()
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(request))
.retrieve()
.bodyToMono(String::class.java)
.block()

log.info { "response: $response" }
}

@Scheduled(cron = "* * 10 * * 1")
fun sendWeeklyStatistics() {
log.info { "위클리 지표 스케줄러 돌기 시작" }
val lastWeekMonday = LocalDate.now().minusDays(7)
val lastWeekSunday = LocalDate.now().minusDays(1)

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/kotlin/com/nexters/bottles/app/user/repository/UserProfileRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ interface UserProfileRepository : JpaRepository<UserProfile, Long> {
fun findAllWithUser(): List<UserProfile>

fun findAllByCreatedAtGreaterThanAndCreatedAtLessThan(from: LocalDateTime, end: LocalDateTime): List<UserProfile>

fun findAllByUserIdIn(userIds: List<Long>): List<UserProfile>
}
Loading