aksdb/wotra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: closing the week early should count properly

Browse Source
This commit is contained in:
Andreas Schneider
2026-05-13 20:47:39 +00:00
parent c617012401
commit 8cd58fbd2c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/service/week_service.go
View File

@@ -197,9 +197,11 @@ func (s *WeekService) CloseWeek(ctx context.Context, weekKey string) (*domain.Cl
// Compute expected ms for the week (from settings frozen at week start)
expectedMs := int64(set.HoursPerWeek * 3_600_000)
// Verify all past workdays that have entries are closed; collect worked ms.
// Past workdays with no entries at all are skipped (they contribute 0h).
// Future workdays in the week are always skipped.
// Collect worked ms across all workdays in the week.
// A workday is included if it has a closed_days record — whether past or future
// (future days can be pre-marked as holiday/vacation before closing the week early).
// Past workdays with open entries require an explicit close before the week can close.
// Past workdays with no record and no entries contribute 0h.
todayKey := s.clock.Now().In(s.tz).Format("2006-01-02")
var totalWorkedMs int64
for _, dk := range dayKeys {
@@ -207,18 +209,20 @@ func (s *WeekService) CloseWeek(ctx context.Context, weekKey string) (*domain.Cl
if !set.IsWorkday(int(t.Weekday())) {
continue // weekend or non-workday — skip
}
if dk > todayKey {
continue // future workday — skip
}
cd, err := s.closedDays.GetByDayKey(ctx, dk)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return nil, err
}
if cd != nil {
// Already closed (past or pre-marked future) — count it.
totalWorkedMs += cd.WorkedMs
continue
}
// No closed_days record — check whether the day has any entries.
if dk > todayKey {
// Future workday with no closed record — entries are impossible, skip.
continue
}
// Past/today workday with no closed record — check whether entries exist.
dayEntries, err := s.entries.ListByDayKey(ctx, dk)
if err != nil {
return nil, err