Fix to handle time UTC (#171)

Noah Hanjun Lee · web-flow · commit c50de5779731 · 2021-10-17T20:14:05.000+09:00
diff --git a/ent/schema/approval.go b/ent/schema/approval.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema/edge"
@@ -26,10 +24,10 @@ func (Approval) Fields() []ent.Field {
 			).
 			Default("pending"),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		// Edges
 		field.Int64("user_id"),
 		field.Int("deployment_id"),
diff --git a/ent/schema/callback.go b/ent/schema/callback.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
@@ -29,10 +27,10 @@ func (Callback) Fields() []ent.Field {
 				"unlock",
 			),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		field.Int64("repo_id"),
 	}
 }
diff --git a/ent/schema/chatuser.go b/ent/schema/chatuser.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
@@ -25,10 +23,10 @@ func (ChatUser) Fields() []ent.Field {
 		field.String("bot_token").
 			Sensitive(),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		field.Int64("user_id"),
 	}
 }
diff --git a/ent/schema/deployment.go b/ent/schema/deployment.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema/edge"
@@ -56,10 +54,10 @@ func (Deployment) Fields() []ent.Field {
 		field.Int("required_approval_count").
 			Default(0),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		// Edges
 		field.Int64("user_id"),
 		field.Int64("repo_id"),
diff --git a/ent/schema/deploymentstatistics.go b/ent/schema/deploymentstatistics.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
@@ -31,10 +29,10 @@ func (DeploymentStatistics) Fields() []ent.Field {
 		field.Int("lead_time_seconds").
 			Default(0),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		field.Int64("repo_id"),
 	}
 }
diff --git a/ent/schema/deploymentstatus.go b/ent/schema/deploymentstatus.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
@@ -22,10 +20,10 @@ func (DeploymentStatus) Fields() []ent.Field {
 		field.String("log_url").
 			Optional(),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 
 		// edges
 		field.Int("deployment_id"),
diff --git a/ent/schema/event.go b/ent/schema/event.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
@@ -29,7 +27,7 @@ func (Event) Fields() []ent.Field {
 				"deleted",
 			),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Int("deployment_id").
 			Optional(),
 		field.Int("approval_id").
diff --git a/ent/schema/lock.go b/ent/schema/lock.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
@@ -22,7 +20,7 @@ func (Lock) Fields() []ent.Field {
 			Optional().
 			Nillable(),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		// Edges
 		field.Int64("user_id"),
 		field.Int64("repo_id"),
diff --git a/ent/schema/perm.go b/ent/schema/perm.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/dialect"
 	"entgo.io/ent/schema/edge"
@@ -31,10 +29,10 @@ func (Perm) Fields() []ent.Field {
 				dialect.MySQL: "timestamp(6)",
 			}),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		// Edges
 		field.Int64("user_id"),
 		field.Int64("repo_id"),
diff --git a/ent/schema/repo.go b/ent/schema/repo.go
@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema/edge"
@@ -30,10 +28,10 @@ func (Repo) Fields() []ent.Field {
 		field.Int64("webhook_id").
 			Optional(),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 		// Denormalization to sort with deployment.
 		field.Time("latest_deployed_at").
 			Optional(),
diff --git a/ent/schema/shared.go b/ent/schema/shared.go
@@ -0,0 +1,21 @@
+package schema
+
+import (
+	"math/rand"
+	"time"
+)
+
+func generateHash() string {
+	rand.Seed(time.Now().UnixNano())
+
+	var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+	b := make([]rune, 32)
+	for i := range b {
+		b[i] = letterRunes[rand.Intn(len(letterRunes))]
+	}
+	return string(b)
+}
+
+func nowUTC() time.Time {
+	return time.Now().UTC()
+}
diff --git a/ent/schema/user.go b/ent/schema/user.go
@@ -1,9 +1,6 @@
 package schema
 
 import (
-	"math/rand"
-	"time"
-
 	"entgo.io/ent"
 	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema/edge"
@@ -35,10 +32,10 @@ func (User) Fields() []ent.Field {
 			DefaultFunc(generateHash).
 			Sensitive(),
 		field.Time("created_at").
-			Default(time.Now),
+			Default(nowUTC),
 		field.Time("updated_at").
-			Default(time.Now).
-			UpdateDefault(time.Now),
+			Default(nowUTC).
+			UpdateDefault(nowUTC),
 	}
 }
 
@@ -59,14 +56,3 @@ func (User) Edges() []ent.Edge {
 		edge.To("locks", Lock.Type),
 	}
 }
-
-func generateHash() string {
-	rand.Seed(time.Now().UnixNano())
-
-	var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]rune, 32)
-	for i := range b {
-		b[i] = letterRunes[rand.Intn(len(letterRunes))]
-	}
-	return string(b)
-}
diff --git a/internal/interactor/deployment.go b/internal/interactor/deployment.go
@@ -110,7 +110,7 @@ L:
 				break L
 			}
 		case t := <-ticker.C:
-			ds, err := i.ListInactiveDeploymentsLessThanTime(ctx, t.Add(-30*time.Minute), 1, 30)
+			ds, err := i.ListInactiveDeploymentsLessThanTime(ctx, t.Add(-30*time.Minute).UTC(), 1, 30)
 			if err != nil {
 				i.log.Error("It has failed to read inactive deployments.", zap.Error(err))
 				continue
diff --git a/internal/interactor/event.go b/internal/interactor/event.go
@@ -29,7 +29,7 @@ L:
 			}
 
 		case t := <-ticker.C:
-			es, err := i.ListEventsGreaterThanTime(ctx, t.Add(-period))
+			es, err := i.ListEventsGreaterThanTime(ctx, t.Add(-period).UTC())
 			if err != nil {
 				i.log.Error("It has failed to read events.", zap.Error(err))
 				continue
diff --git a/internal/interactor/lock.go b/internal/interactor/lock.go
@@ -20,15 +20,15 @@ L:
 				break L
 			}
 		case t := <-ticker.C:
-			ls, err := i.ListExpiredLocksLessThanTime(ctx, t)
+			ls, err := i.ListExpiredLocksLessThanTime(ctx, t.UTC())
 			if err != nil {
 				i.log.Error("It has failed to read expired locks.", zap.Error(err))
 				continue
 			}
 
 			for _, l := range ls {
 				i.DeleteLock(ctx, l)
-				i.log.Debug("Delete the expired lock.", zap.Int("id", l.ID))
+				i.log.Debug("Delete the expired lock.", zap.Int("id", l.ID), zap.Time("time", t))
 			}
 		}
 	}
diff --git a/internal/server/api/v1/search/search.go b/internal/server/api/v1/search/search.go
@@ -95,7 +95,7 @@ func (s *Search) SearchDeployments(c *gin.Context) {
 	v, _ := c.Get(gb.KeyUser)
 	u := v.(*ent.User)
 
-	if ds, err = s.i.SearchDeployments(ctx, u, ss, o, f, t, p, pp); err != nil {
+	if ds, err = s.i.SearchDeployments(ctx, u, ss, o, f.UTC(), t.UTC(), p, pp); err != nil {
 		s.log.Error("It has failed to search deployments.", zap.Error(err))
 		gb.ErrorResponse(c, http.StatusInternalServerError, "It has failed to search deployments.")
 		return
@@ -159,7 +159,7 @@ func (s *Search) SearchApprovals(c *gin.Context) {
 	v, _ := c.Get(gb.KeyUser)
 	u := v.(*ent.User)
 
-	if ds, err = s.i.SearchApprovals(ctx, u, ss, f, t, p, pp); err != nil {
+	if ds, err = s.i.SearchApprovals(ctx, u, ss, f.UTC(), t.UTC(), p, pp); err != nil {
 		s.log.Error("It has failed to search deployments.", zap.Error(err))
 		gb.ErrorResponse(c, http.StatusInternalServerError, "It has failed to search deployments.")
 		return
diff --git a/internal/server/api/v1/sync/syncher.go b/internal/server/api/v1/sync/syncher.go
@@ -43,7 +43,7 @@ func (s *Syncher) Sync(c *gin.Context) {
 		return
 	}
 
-	syncTime := time.Now()
+	syncTime := time.Now().UTC()
 	syncCnt := 0
 	for _, re := range remotes {
 		// Skip un-selected repositories.
diff --git a/internal/server/metrics/metrics.go b/internal/server/metrics/metrics.go
@@ -85,7 +85,7 @@ func (c *collector) Collect(ch chan<- prometheus.Metric) {
 			err error
 		)
 
-		start := time.Now()
+		start := time.Now().UTC()
 		defer func() {
 			c.lastTime = start
 		}()

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ L:`
`110`	`110`	`break L`
`111`	`111`	`}`
`112`	`112`	`case t := <-ticker.C:`
`113`		`- ds, err := i.ListInactiveDeploymentsLessThanTime(ctx, t.Add(-30*time.Minute), 1, 30)`
	`113`	`+ ds, err := i.ListInactiveDeploymentsLessThanTime(ctx, t.Add(-30*time.Minute).UTC(), 1, 30)`
`114`	`114`	`if err != nil {`
`115`	`115`	`i.log.Error("It has failed to read inactive deployments.", zap.Error(err))`
`116`	`116`	`continue`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ L:`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`case t := <-ticker.C:`
`32`		`- es, err := i.ListEventsGreaterThanTime(ctx, t.Add(-period))`
	`32`	`+ es, err := i.ListEventsGreaterThanTime(ctx, t.Add(-period).UTC())`
`33`	`33`	`if err != nil {`
`34`	`34`	`i.log.Error("It has failed to read events.", zap.Error(err))`
`35`	`35`	`continue`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,15 @@ L:`
`20`	`20`	`break L`
`21`	`21`	`}`
`22`	`22`	`case t := <-ticker.C:`
`23`		`- ls, err := i.ListExpiredLocksLessThanTime(ctx, t)`
	`23`	`+ ls, err := i.ListExpiredLocksLessThanTime(ctx, t.UTC())`
`24`	`24`	`if err != nil {`
`25`	`25`	`i.log.Error("It has failed to read expired locks.", zap.Error(err))`
`26`	`26`	`continue`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`for _, l := range ls {`
`30`	`30`	`i.DeleteLock(ctx, l)`
`31`		`- i.log.Debug("Delete the expired lock.", zap.Int("id", l.ID))`
	`31`	`+ i.log.Debug("Delete the expired lock.", zap.Int("id", l.ID), zap.Time("time", t))`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (s Syncher) Sync(c gin.Context) {`
`43`	`43`	`return`
`44`	`44`	`}`
`45`	`45`
`46`		`- syncTime := time.Now()`
	`46`	`+ syncTime := time.Now().UTC()`
`47`	`47`	`syncCnt := 0`
`48`	`48`	`for _, re := range remotes {`
`49`	`49`	`// Skip un-selected repositories.`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func (c *collector) Collect(ch chan<- prometheus.Metric) {`
`85`	`85`	`err error`
`86`	`86`	`)`
`87`	`87`
`88`		`- start := time.Now()`
	`88`	`+ start := time.Now().UTC()`
`89`	`89`	`defer func() {`
`90`	`90`	`c.lastTime = start`
`91`	`91`	`}()`