fix: merge conflict

Author: fiftin

.dredd/hooks/helpers.go

@@ -3,8 +3,8 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"os"
-	"time"
 
 	"github.com/go-gorp/gorp/v3"
 	"github.com/semaphoreui/semaphore/db"
@@ -23,7 +23,7 @@ func addTestRunnerUser() {
 		Username: "ITU-" + uid,
 		Name:     "ITU-" + uid,
 		Email:    uid + "@semaphore.test",
-		Created:  db.GetParsedTime(time.Now().UTC()),
+		Created:  db.GetParsedTime(tz.Now()),
 		Admin:    true,
 	}
 
@@ -148,7 +148,7 @@ func addProject() *db.Project {
 	chat := "Test"
 	project := db.Project{
 		Name:      "ITP-" + uid,
-		Created:   time.Now().UTC(),
+		Created:   tz.Now(),
 		AlertChat: &chat,
 	}
 	project, err := store.CreateProject(project)
@@ -167,7 +167,7 @@ func addProject() *db.Project {
 func addUser() *db.User {
 	uid := getUUID()
 	user := db.User{
-		Created:  time.Now().UTC(),
+		Created:  tz.Now(),
 		Username: "ITU-" + uid,
 		Email:    "test@semaphore." + uid,
 		Name:     "ITU-" + uid,
@@ -215,7 +215,7 @@ func addTask() *db.Task {
 		TemplateID: templateID,
 		Status:     "testing",
 		UserID:     &userPathTestUser.ID,
-		Created:    db.GetParsedTime(time.Now().UTC()),
+		Created:    db.GetParsedTime(tz.Now()),
 	}
 
 	t, err := store.CreateTask(t, 0)
@@ -285,7 +285,7 @@ func addIntegrationMatcher() *db.IntegrationMatcher {
 func addToken(tok string, user int) {
 	_, err := store.CreateAPIToken(db.APIToken{
 		ID:      tok,
-		Created: time.Now().UTC(),
+		Created: tz.Now(),
 		UserID:  user,
 		Expired: false,
 	})

api/login.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"net/http"
 	"net/url"
 	"os"
@@ -128,7 +129,7 @@ func tryFindLDAPUser(username, password string) (*db.User, error) {
 
 	ldapUser := db.User{
 		Username: strings.ToLower(claims.username),
-		Created:  time.Now().UTC(),
+		Created:  tz.Now(),
 		Name:     claims.name,
 		Email:    claims.email,
 		External: true,
@@ -162,8 +163,8 @@ func createSession(w http.ResponseWriter, r *http.Request, user db.User) {
 
 	newSession, err := helpers.Store(r).CreateSession(db.Session{
 		UserID:             user.ID,
-		Created:            time.Now().UTC(),
-		LastActive:         time.Now().UTC(),
+		Created:            tz.Now(),
+		LastActive:         tz.Now(),
 		IP:                 r.Header.Get("X-Real-IP"),
 		UserAgent:          r.Header.Get("user-agent"),
 		Expired:            false,
@@ -376,7 +377,7 @@ func logout(w http.ResponseWriter, r *http.Request) {
 	http.SetCookie(w, &http.Cookie{
 		Name:     "semaphore",
 		Value:    "",
-		Expires:  time.Now().Add(24 * 7 * time.Hour * -1),
+		Expires:  tz.Now().Add(24 * 7 * time.Hour * -1),
 		Path:     "/",
 		HttpOnly: true,
 	})
@@ -491,7 +492,7 @@ func oidcLogin(w http.ResponseWriter, r *http.Request) {
 }
 
 func generateStateOauthCookie(w http.ResponseWriter) string {
-	expiration := time.Now().Add(365 * 24 * time.Hour)
+	expiration := tz.Now().Add(365 * 24 * time.Hour)
 
 	b := make([]byte, 16)
 	_, err := rand.Read(b)

api/router.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"embed"
 	"fmt"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"net/http"
 	"os"
 	"path"
@@ -21,7 +22,7 @@ import (
 	"github.com/semaphoreui/semaphore/util"
 )
 
-var startTime = time.Now().UTC()
+var startTime = tz.Now()
 
 //go:embed public/*
 var publicAssets embed.FS
@@ -542,6 +543,8 @@ func getSystemInfo(w http.ResponseWriter, r *http.Request) {
 		},
 
 		"git_client": util.Config.GitClientId,
+
+		"schedule_timezone": util.Config.Schedule.Timezone,
 	}
 
 	helpers.WriteJSON(w, http.StatusOK, body)

api/sockets/handler.go

@@ -3,6 +3,7 @@ package sockets
 import (
 	"fmt"
 	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"net/http"
 	"time"
 
@@ -49,10 +50,10 @@ func (c *connection) readPump() {
 
 	c.ws.SetReadLimit(maxMessageSize)
 
-	util.LogErrorF(c.ws.SetReadDeadline(time.Now().Add(pongWait)), log.Fields{"error": "Cannot set read deadline"})
+	util.LogErrorF(c.ws.SetReadDeadline(tz.Now().Add(pongWait)), log.Fields{"error": "Cannot set read deadline"})
 
 	c.ws.SetPongHandler(func(string) error {
-		err := c.ws.SetReadDeadline(time.Now().Add(pongWait))
+		err := c.ws.SetReadDeadline(tz.Now().Add(pongWait))
 		util.LogErrorF(err, log.Fields{"error": "Cannot set read deadline"})
 		return nil
 	})
@@ -73,7 +74,7 @@ func (c *connection) readPump() {
 // write writes a message with the given message type and payload.
 func (c *connection) write(mt int, payload []byte) error {
 
-	err := c.ws.SetWriteDeadline(time.Now().Add(writeWait))
+	err := c.ws.SetWriteDeadline(tz.Now().Add(writeWait))
 
 	util.LogErrorF(err, log.Fields{"error": "Cannot set write deadline"})
 

db/Migration.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"fmt"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"slices"
 	"strconv"
 	"strings"
@@ -229,9 +230,9 @@ func Migrate(d Store, targetVersion *string) error {
 		}
 
 		didRun = true
-		fmt.Printf("Executing migration %s (at %v)...\n", version.HumanoidVersion(), time.Now().UTC())
+		fmt.Printf("Executing migration %s (at %v)...\n", version.HumanoidVersion(), tz.Now())
 		if err := d.ApplyMigration(version); err != nil {
-			fmt.Printf("Rolling back %s (time: %v)...\n", version.HumanoidVersion(), time.Now().UTC())
+			fmt.Printf("Rolling back %s (time: %v)...\n", version.HumanoidVersion(), tz.Now())
 			d.TryRollbackMigration(version)
 			return err
 		}

db/Task.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"time"
 
 	"github.com/go-gorp/gorp/v3"
@@ -84,19 +85,19 @@ func (task *Task) FillParams(target interface{}) (err error) {
 }
 
 func (task *Task) PreInsert(gorp.SqlExecutor) error {
-	task.Created = task.Created.UTC()
+	task.Created = tz.In(task.Created)
 
 	return nil
 }
 
 func (task *Task) PreUpdate(gorp.SqlExecutor) error {
 	if task.Start != nil {
-		start := task.Start.UTC()
+		start := tz.In(*task.Start)
 		task.Start = &start
 	}
 
 	if task.End != nil {
-		end := task.End.UTC()
+		end := tz.In(*task.End)
 		task.End = &end
 	}
 	return nil

db/bolt/event.go

@@ -3,8 +3,8 @@ package bolt
 import (
 	"encoding/json"
 	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"go.etcd.io/bbolt"
-	"time"
 )
 
 //func (d *BoltDb) getEventObjectName(evt db.Event) (string, error) {
@@ -73,7 +73,7 @@ func (d *BoltDb) getEvents(c enumerable, params db.RetrieveQueryParams, filter f
 
 func (d *BoltDb) CreateEvent(evt db.Event) (newEvent db.Event, err error) {
 	newEvent = evt
-	newEvent.Created = time.Now().UTC()
+	newEvent.Created = tz.Now()
 
 	err = d.db.Update(func(tx *bbolt.Tx) error {
 		b, err2 := tx.CreateBucketIfNotExists([]byte("events"))

db/bolt/global_runner.go

@@ -2,10 +2,9 @@ package bolt
 
 import (
 	"encoding/base64"
-	"time"
-
 	"github.com/gorilla/securecookie"
 	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"go.etcd.io/bbolt"
 )
 
@@ -84,14 +83,14 @@ func (d *BoltDb) updateRunner(runner db.Runner, updater func(targetRunner *db.Ru
 
 func (d *BoltDb) ClearRunnerCache(runner db.Runner) (err error) {
 	return d.updateRunner(runner, func(targetRunner *db.Runner, foundRunner db.Runner) {
-		now := time.Now().UTC()
+		now := tz.Now()
 		targetRunner.CleaningRequested = &now
 	})
 }
 
 func (d *BoltDb) TouchRunner(runner db.Runner) (err error) {
 	return d.updateRunner(runner, func(targetRunner *db.Runner, foundRunner db.Runner) {
-		now := time.Now().UTC()
+		now := tz.Now()
 		targetRunner.Touched = &now
 	})
 }

db/bolt/project.go

@@ -2,11 +2,11 @@ package bolt
 
 import (
 	"github.com/semaphoreui/semaphore/db"
-	"time"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 )
 
 func (d *BoltDb) CreateProject(project db.Project) (db.Project, error) {
-	project.Created = time.Now().UTC()
+	project.Created = tz.Now()
 
 	newProject, err := d.createObject(0, db.ProjectProps, project)
 

db/bolt/project_test.go

@@ -2,8 +2,8 @@ package bolt
 
 import (
 	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/pkg/tz"
 	"testing"
-	"time"
 )
 
 func TestGetProjects(t *testing.T) {
@@ -23,7 +23,7 @@ func TestGetProjects(t *testing.T) {
 	}
 
 	proj1, err := store.CreateProject(db.Project{
-		Created: time.Now().UTC(),
+		Created: tz.Now(),
 		Name:    "Test1",
 	})
 
@@ -57,7 +57,7 @@ func TestGetProject(t *testing.T) {
 	store := CreateTestStore()
 
 	proj, err := store.CreateProject(db.Project{
-		Created: time.Now().UTC(),
+		Created: tz.Now(),
 		Name:    "Test1",
 	})