Skip to content

fix: 회차 스케줄러 버그 수정 (P0 #5, #6, #7) #26

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
choihooo merged 2 commits into from
Mar 10, 2026
Merged

fix: 회차 스케줄러 버그 수정 (P0 #5, #6, #7) #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc955de
fix: 회차 스케줄러 버그 수정 (P0 #5, #6, #7)
choihooo Mar 10, 2026
f174c98
refactor: 타임존 처리를 formatKSTDate 헬퍼 함수로 분리
choihooo Mar 10, 2026
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
135 changes: 75 additions & 60 deletions packages/bot/src/schedulers/round-reporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
attendance,
members,
posts,
rounds,
type Round,
} from '@blog-study/shared/db';
import {
Expand All @@ -26,6 +27,16 @@ import {
type RoundReportData,
} from '../services/notification.service';

/**
* Format KST date to ISO date string (YYYY-MM-DD)
* P0 #6: KST 기준 날짜 포맷팅 (UTC+9)
*/
function formatKSTDate(date: Date): string {
const kstOffset = 9 * 60 * 60 * 1000; // UTC+9
const kstDate = new Date(date.getTime() + kstOffset);
return kstDate.toISOString().split('T')[0]!;
}

/**
* Result of a round report cycle
*/
Expand Down Expand Up @@ -182,12 +193,28 @@ export class RoundReporter {

console.log(`[RoundReporter] Round ${currentRound.roundNumber} report ${sent ? 'sent' : 'failed'}`);

// P0 #7: 회차 종료 후 isCurrent 플래그 업데이트
// 다음 회차가 있으면 해당 회차를 current로 설정
const nextRound = await getRoundByNumber(currentRound.roundNumber + 1);
if (nextRound) {
await setCurrentRound(nextRound.roundNumber);
console.log(`[RoundReporter] Updated current round to ${nextRound.roundNumber}`);
} else {
// 다음 회차가 없으면 현재 회차의 isCurrent를 false로 변경
const db = getDb();
await db
.update(rounds)
.set({ isCurrent: false })
.where(eq(rounds.id, currentRound.id));
console.log(`[RoundReporter] No next round, unset isCurrent for round ${currentRound.roundNumber}`);
}

return {
timestamp: startTime,
roundNumber: currentRound.roundNumber,
reportSent: sent,
newRoundStarted: false,
newRoundNumber: null,
newRoundStarted: nextRound !== null,
newRoundNumber: nextRound?.roundNumber ?? null,
errors,
};
} catch (error) {
Expand All @@ -211,6 +238,7 @@ export class RoundReporter {
/**
* Send round start announcement for a new round
* Requirements: 10.4 - Send round start announcement with deadline info
* P0 #6: KST 타임존 기준으로 날짜 비교
*/
async sendRoundStartAnnouncement(): Promise<RoundReportResult> {
const startTime = new Date();
Expand All @@ -220,81 +248,68 @@ export class RoundReporter {
// Get the current round
const currentRound = await getCurrentRound();

// Check if this is actually the start of a new round
// (Monday of the round's start week)
const today = new Date();
const roundStartDate = new Date(currentRound.startDate + 'T00:00:00.000Z');

// Check if today is the start date of the current round
const isSameDay =
today.getUTCFullYear() === roundStartDate.getUTCFullYear() &&
today.getUTCMonth() === roundStartDate.getUTCMonth() &&
today.getUTCDate() === roundStartDate.getUTCDate();

if (!isSameDay) {
// Not a round start day, check if we need to advance to next round
const nextRound = await getRoundByNumber(currentRound.roundNumber + 1);

if (nextRound) {
const nextRoundStartDate = new Date(nextRound.startDate + 'T00:00:00.000Z');
const isNextRoundStartDay =
today.getUTCFullYear() === nextRoundStartDate.getUTCFullYear() &&
today.getUTCMonth() === nextRoundStartDate.getUTCMonth() &&
today.getUTCDate() === nextRoundStartDate.getUTCDate();

if (isNextRoundStartDay) {
// Advance to next round
await setCurrentRound(nextRound.roundNumber);

console.log(`[RoundReporter] Starting round ${nextRound.roundNumber}`);

// Send announcement
const notificationService = getNotificationService();
const sent = await notificationService.sendRoundStartAnnouncement(nextRound);

if (!sent) {
errors.push('Failed to send round start announcement');
}

return {
timestamp: startTime,
roundNumber: currentRound.roundNumber,
reportSent: false,
newRoundStarted: sent,
newRoundNumber: nextRound.roundNumber,
errors,
};
}
// P0 #6: KST 기준으로 오늘 날짜 구하기
const todayStr = formatKSTDate(new Date());

// 회차 시작일과 비교 (KST 기준)
const isTodayRoundStart = todayStr === currentRound.startDate;

if (isTodayRoundStart) {
// 오늘이 현재 회차 시작일 - 알림 발송
console.log(`[RoundReporter] Sending start announcement for round ${currentRound.roundNumber}`);

const notificationService = getNotificationService();
const sent = await notificationService.sendRoundStartAnnouncement(currentRound);

if (!sent) {
errors.push('Failed to send round start announcement');
}

console.log('[RoundReporter] Not a round start day, skipping announcement');
return {
timestamp: startTime,
roundNumber: currentRound.roundNumber,
reportSent: false,
newRoundStarted: false,
newRoundNumber: null,
errors: ['Not a round start day'],
newRoundStarted: sent,
newRoundNumber: currentRound.roundNumber,
errors,
};
}

// Today is the start of the current round - send announcement
console.log(`[RoundReporter] Sending start announcement for round ${currentRound.roundNumber}`);
// 오늘이 현재 회차 시작일이 아니면, 다음 회차 시작일인지 확인
const nextRound = await getRoundByNumber(currentRound.roundNumber + 1);

const notificationService = getNotificationService();
const sent = await notificationService.sendRoundStartAnnouncement(currentRound);
if (nextRound && todayStr === nextRound.startDate) {
// 오늘이 다음 회차 시작일 - 회차 전환 + 알림 발송
await setCurrentRound(nextRound.roundNumber);

if (!sent) {
errors.push('Failed to send round start announcement');
console.log(`[RoundReporter] Starting round ${nextRound.roundNumber}`);

const notificationService = getNotificationService();
const sent = await notificationService.sendRoundStartAnnouncement(nextRound);

if (!sent) {
errors.push('Failed to send round start announcement');
}

return {
timestamp: startTime,
roundNumber: currentRound.roundNumber,
reportSent: false,
newRoundStarted: sent,
newRoundNumber: nextRound.roundNumber,
errors,
};
}

// 회차 시작일이 아님
console.log('[RoundReporter] Not a round start day, skipping announcement');
return {
timestamp: startTime,
roundNumber: currentRound.roundNumber,
reportSent: false,
newRoundStarted: sent,
newRoundNumber: currentRound.roundNumber,
errors,
newRoundStarted: false,
newRoundNumber: null,
errors: ['Not a round start day'],
};
} catch (error) {
const errorMsg = error instanceof Error ? error.message : String(error);
Expand Down
8 changes: 8 additions & 0 deletions packages/bot/src/schedulers/weekly-ranking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,21 @@ async function getMemberRankings(): Promise<MemberRanking[]> {
.groupBy(members.id);

// Get activity scores for each member
// P0 #5: 이번 주 기간 점수만 필터링
const weekDates = getWeekDates();
const weekStartDate = new Date(weekDates.startDate + 'T00:00:00.000+09:00');
const weekEndDate = new Date(weekDates.endDate + 'T23:59:59.999+09:00');

const scoreStats = await db
.select({
memberId: activityScores.memberId,
totalScore: sql<number>`COALESCE(SUM(${activityScores.points}), 0)`,
discordScore: sql<number>`COALESCE(SUM(CASE WHEN ${activityScores.type} IN (${ActivityScoreType.DISCORD_MESSAGE}, ${ActivityScoreType.DISCORD_THREAD}, ${ActivityScoreType.DISCORD_REACTION}) THEN ${activityScores.points} ELSE 0 END), 0)`,
})
.from(activityScores)
.where(
sql`${activityScores.createdAt} >= ${weekStartDate} AND ${activityScores.createdAt} <= ${weekEndDate}`
)
.groupBy(activityScores.memberId);

// Create score maps
Expand Down