From 8d6ae85b0d76b2e25198a4e474b608345d33e34a Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan@moebiusband.org>
Date: Mon, 26 May 2025 13:26:18 +0200
Subject: [PATCH] Fix bug with job columns

---
 internal/repository/job.go       | 29 +++++++++++++++++------------
 internal/repository/jobCreate.go |  2 +-
 internal/repository/jobFind.go   |  2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/internal/repository/job.go b/internal/repository/job.go
index 97ca280..c6c566e 100644
--- a/internal/repository/job.go
+++ b/internal/repository/job.go
@@ -51,25 +51,30 @@ func GetJobRepository() *JobRepository {
 	return jobRepoInstance
 }
 
-// var jobColumns []string = []string{
-// 	"job.id", "job.job_id", "job.hpc_user", "job.project", "job.cluster", "job.subcluster", "job.start_time", "job.cluster_partition", "job.array_job_id",
-// 	"job.num_nodes", "job.num_hwthreads", "job.num_acc", "job.exclusive", "job.monitoring_status", "job.smt", "job.job_state",
-// 	"job.duration", "job.walltime", "job.resources", "job.footprint", "job.energy",
-// }
-
 var jobColumns []string = []string{
-	"id", "job_id", "hpc_user", "project", "cluster", "subcluster", "start_time",
-	"cluster_partition", "array_job_id", "num_nodes", "num_hwthreads", "num_acc",
-	"exclusive", "monitoring_status", "smt", "job_state", "duration", "walltime",
-	"resources", "footprint", "energy",
+	"job.id", "job.job_id", "job.hpc_user", "job.project", "job.cluster", "job.subcluster",
+	"job.start_time", "job.cluster_partition", "job.array_job_id", "job.num_nodes",
+	"job.num_hwthreads", "job.num_acc", "job.exclusive", "job.monitoring_status",
+	"job.smt", "job.job_state", "job.duration", "job.walltime", "job.resources",
+	"job.footprint", "job.energy",
+}
+
+var jobCacheColumns []string = []string{
+	"jobcache.id", "jobcache.job_id", "jobcache.hpc_user", "jobcache.project", "jobcache.cluster",
+	"jobcache.subcluster", "jobcache.start_time", "jobcache.cluster_partition",
+	"jobcache.array_job_id", "jobcache.num_nodes", "jobcache.num_hwthreads",
+	"jobcache.num_acc", "jobcache.exclusive", "jobcache.monitoring_status", "jobcache.smt",
+	"jobcache.job_state", "jobcache.duration", "jobcache.walltime", "jobcache.resources",
+	"jobcache.footprint", "jobcache.energy",
 }
 
 func scanJob(row interface{ Scan(...any) error }) (*schema.Job, error) {
 	job := &schema.Job{}
 
 	if err := row.Scan(
-		&job.ID, &job.JobID, &job.User, &job.Project, &job.Cluster, &job.SubCluster, &job.StartTimeUnix, &job.Partition, &job.ArrayJobId,
-		&job.NumNodes, &job.NumHWThreads, &job.NumAcc, &job.Exclusive, &job.MonitoringStatus, &job.SMT, &job.State,
+		&job.ID, &job.JobID, &job.User, &job.Project, &job.Cluster, &job.SubCluster,
+		&job.StartTimeUnix, &job.Partition, &job.ArrayJobId, &job.NumNodes, &job.NumHWThreads,
+		&job.NumAcc, &job.Exclusive, &job.MonitoringStatus, &job.SMT, &job.State,
 		&job.Duration, &job.Walltime, &job.RawResources, &job.RawFootprint, &job.Energy); err != nil {
 		log.Warnf("Error while scanning rows (Job): %v", err)
 		return nil, err
diff --git a/internal/repository/jobCreate.go b/internal/repository/jobCreate.go
index a651db9..f286c68 100644
--- a/internal/repository/jobCreate.go
+++ b/internal/repository/jobCreate.go
@@ -50,7 +50,7 @@ func (r *JobRepository) SyncJobs() ([]*schema.Job, error) {
 	r.Mutex.Lock()
 	defer r.Mutex.Unlock()
 
-	query := sq.Select(jobColumns...).From("job_cache")
+	query := sq.Select(jobCacheColumns...).From("job_cache")
 
 	rows, err := query.RunWith(r.stmtCache).Query()
 	if err != nil {
diff --git a/internal/repository/jobFind.go b/internal/repository/jobFind.go
index 614b7c0..b820084 100644
--- a/internal/repository/jobFind.go
+++ b/internal/repository/jobFind.go
@@ -48,7 +48,7 @@ func (r *JobRepository) FindCached(
 	cluster *string,
 	startTime *int64,
 ) (*schema.Job, error) {
-	q := sq.Select(jobColumns...).From("job_cache").
+	q := sq.Select(jobCacheColumns...).From("job_cache").
 		Where("job_cache.job_id = ?", *jobId)
 
 	if cluster != nil {