fix: attempt to fix race condition when counting

Author: muety

services/misc.go

@@ -3,7 +3,6 @@ package services
 import (
 	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
-	"go.uber.org/atomic"
 	"runtime"
 	"strconv"
 	"time"
@@ -17,7 +16,6 @@ type MiscService struct {
 	userService     IUserService
 	summaryService  ISummaryService
 	keyValueService IKeyValueService
-	jobCount        atomic.Uint32
 }
 
 func NewMiscService(userService IUserService, summaryService ISummaryService, keyValueService IKeyValueService) *MiscService {
@@ -51,56 +49,34 @@ func (srv *MiscService) ScheduleCountTotalTime() {
 }
 
 func (srv *MiscService) runCountTotalTime() error {
-	jobs := make(chan *CountTotalTimeJob)
-	results := make(chan *CountTotalTimeResult)
-
-	defer close(jobs)
-
-	for i := 0; i < runtime.NumCPU(); i++ {
-		go srv.countTotalTimeWorker(jobs, results)
+	users, err := srv.userService.GetAll()
+	if err != nil {
+		return err
 	}
 
-	go srv.persistTotalTimeWorker(results)
+	jobs := make(chan *CountTotalTimeJob, len(users))
+	results := make(chan *CountTotalTimeResult, len(users))
 
-	// generate the jobs
-	if users, err := srv.userService.GetAll(); err == nil {
-		for _, u := range users {
-			jobs <- &CountTotalTimeJob{
-				UserID:  u.ID,
-				NumJobs: len(users),
-			}
+	for _, u := range users {
+		jobs <- &CountTotalTimeJob{
+			UserID:  u.ID,
+			NumJobs: len(users),
 		}
-	} else {
-		return err
 	}
+	close(jobs)
 
-	return nil
-}
-
-func (srv *MiscService) countTotalTimeWorker(jobs <-chan *CountTotalTimeJob, results chan<- *CountTotalTimeResult) {
-	for job := range jobs {
-		if result, err := srv.summaryService.Aliased(time.Time{}, time.Now(), &models.User{ID: job.UserID}, srv.summaryService.Retrieve, false); err != nil {
-			config.Log().Error("failed to count total for user %s: %v", job.UserID, err)
-		} else {
-			results <- &CountTotalTimeResult{
-				UserId: job.UserID,
-				Total:  result.TotalTime(),
-			}
-		}
-		if srv.jobCount.Inc() == uint32(job.NumJobs) {
-			srv.jobCount.Store(0)
-			close(results)
-		}
+	for i := 0; i < runtime.NumCPU(); i++ {
+		go srv.countTotalTimeWorker(jobs, results)
 	}
-}
 
-func (srv *MiscService) persistTotalTimeWorker(results <-chan *CountTotalTimeResult) {
-	var c int
+	// persist
+	var i int
 	var total time.Duration
-	for result := range results {
+	for i = 0; i < len(users); i++ {
+		result := <-results
 		total += result.Total
-		c++
 	}
+	close(results)
 
 	if err := srv.keyValueService.PutString(&models.KeyStringValue{
 		Key:   config.KeyLatestTotalTime,
@@ -111,8 +87,23 @@ func (srv *MiscService) persistTotalTimeWorker(results <-chan *CountTotalTimeRes
 
 	if err := srv.keyValueService.PutString(&models.KeyStringValue{
 		Key:   config.KeyLatestTotalUsers,
-		Value: strconv.Itoa(c),
+		Value: strconv.Itoa(i),
 	}); err != nil {
 		logbuch.Error("failed to save total users count: %v", err)
 	}
+
+	return nil
+}
+
+func (srv *MiscService) countTotalTimeWorker(jobs <-chan *CountTotalTimeJob, results chan<- *CountTotalTimeResult) {
+	for job := range jobs {
+		if result, err := srv.summaryService.Aliased(time.Time{}, time.Now(), &models.User{ID: job.UserID}, srv.summaryService.Retrieve, false); err != nil {
+			config.Log().Error("failed to count total for user %s: %v", job.UserID, err)
+		} else {
+			results <- &CountTotalTimeResult{
+				UserId: job.UserID,
+				Total:  result.TotalTime(),
+			}
+		}
+	}
 }