Skip to content

[fix] 주간 미션 KST 주차 경계 ServiceTime 변환 (#266 리뷰 반영) #268

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

Merged
Develop-KIM merged 1 commit into from
Jun 30, 2026
Merged

[fix] 주간 미션 KST 주차 경계 ServiceTime 변환 (#266 리뷰 반영) #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions src/main/kotlin/com/didit/adapter/integration/scheduler/MissionScheduler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ package com.didit.adapter.integration.scheduler
import com.didit.application.achievement.required.MissionRepository
import com.didit.application.achievement.required.UserMissionRepository
import com.didit.application.retrospect.required.RetrospectiveRepository
import com.didit.domain.shared.ServiceTime
import jakarta.transaction.Transactional
import org.slf4j.LoggerFactory
import org.springframework.scheduling.annotation.Scheduled
import org.springframework.stereotype.Component
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
import java.time.temporal.TemporalAdjusters

@Component
Expand Down Expand Up @@ -42,14 +40,13 @@ class MissionScheduler(

consecutiveWeekMissions.forEach { userMission ->
val lastWeekStart =
LocalDate.now().with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY)).minusWeeks(1)
val lastWeekEnd = lastWeekStart.plusDays(6)
ServiceTime.today().with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY)).minusWeeks(1)

val lastWeekRetroCount =
retrospectiveRepository.countCompletedByUserIdAndPeriod(
userId = userMission.userId,
from = LocalDateTime.of(lastWeekStart, LocalTime.MIDNIGHT),
to = LocalDateTime.of(lastWeekEnd, LocalTime.of(23, 59, 59)),
from = ServiceTime.startOfDayUtc(lastWeekStart),
to = ServiceTime.startOfDayUtc(lastWeekStart.plusWeeks(1)),
)

if (lastWeekRetroCount == 0) {
Expand Down
14 changes: 6 additions & 8 deletions src/main/kotlin/com/didit/application/achievement/MissionQueryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ import com.didit.domain.achievement.Mission
import com.didit.domain.achievement.MissionStatus
import com.didit.domain.achievement.MissionType
import com.didit.domain.achievement.UserMission
import com.didit.domain.shared.ServiceTime
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import java.time.DayOfWeek
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
import java.time.temporal.TemporalAdjusters
import java.util.UUID

Expand Down Expand Up @@ -89,15 +88,14 @@ class MissionQueryService(
return null
}

val weekStartDate = getWeekStartDate(LocalDate.now())
val weekEndDate = weekStartDate.plusDays(6)
val from = LocalDateTime.of(weekStartDate, LocalTime.MIDNIGHT)
val to = LocalDateTime.of(weekEndDate, LocalTime.of(23, 59, 59))
val weekStartDate = getWeekStartDate(ServiceTime.today())
val from = ServiceTime.startOfDayUtc(weekStartDate)
val to = ServiceTime.startOfDayUtc(weekStartDate.plusWeeks(1))

val completedRetros = retrospectiveRepository.findCompletedByUserIdAndPeriod(userId, from, to)
val completedDates = completedRetros.map { it.completedAt?.toLocalDate() }.toSet()
val completedDates = completedRetros.mapNotNull { it.completedAt?.let(ServiceTime::toServiceDate) }.toSet()

val today = LocalDate.now()
val today = ServiceTime.today()
val days = mutableListOf<Boolean>()

for (i in 0..6) {
Expand Down
Loading