Refactor repository tests

Add context to tests.
Remove special test routines
This commit is contained in:
2023-08-30 15:04:50 +02:00
parent 59c749a164
commit 9533f06eaf
4 changed files with 47 additions and 80 deletions

View File

@@ -233,10 +233,17 @@ func (r *JobRepository) JobsStatsGrouped(
return stats, nil
}
func (r *JobRepository) jobsStats(
query sq.SelectBuilder,
func (r *JobRepository) JobsStats(
ctx context.Context,
filter []*model.JobFilter) ([]*model.JobsStatistics, error) {
start := time.Now()
query := r.buildStatsQuery(filter, "")
query, err := SecurityCheck(ctx, query)
if err != nil {
return nil, err
}
row := query.RunWith(r.DB).QueryRow()
stats := make([]*model.JobsStatistics, 0, 1)
@@ -267,29 +274,8 @@ func (r *JobRepository) jobsStats(
TotalAccHours: totalAccHours})
}
return stats, nil
}
func (r *JobRepository) testJobsStats(
filter []*model.JobFilter) ([]*model.JobsStatistics, error) {
query := r.buildStatsQuery(filter, "")
return r.jobsStats(query, filter)
}
func (r *JobRepository) JobsStats(
ctx context.Context,
filter []*model.JobFilter) ([]*model.JobsStatistics, error) {
start := time.Now()
query := r.buildStatsQuery(filter, "")
query, err := SecurityCheck(ctx, query)
if err != nil {
return nil, err
}
log.Debugf("Timer JobStats %s", time.Since(start))
return r.jobsStats(query, filter)
return stats, nil
}
func (r *JobRepository) JobCountGrouped(