Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

Fix to handle time UTC #171

Merged
merged 1 commit into from
Oct 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ent/schema/approval.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/dialect/entsql"
"entgo.io/ent/schema/edge"
Expand All @@ -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"),
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/callback.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
Expand All @@ -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"),
}
}
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/chatuser.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
Expand All @@ -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"),
}
}
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/deployment.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/dialect/entsql"
"entgo.io/ent/schema/edge"
Expand Down Expand Up @@ -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"),
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/deploymentstatistics.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
Expand Down Expand Up @@ -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"),
}
}
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/deploymentstatus.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
Expand All @@ -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"),
Expand Down
4 changes: 1 addition & 3 deletions ent/schema/event.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
Expand All @@ -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").
Expand Down
4 changes: 1 addition & 3 deletions ent/schema/lock.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
Expand All @@ -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"),
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/perm.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/dialect"
"entgo.io/ent/schema/edge"
Expand Down Expand Up @@ -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"),
Expand Down
8 changes: 3 additions & 5 deletions ent/schema/repo.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"time"

"entgo.io/ent"
"entgo.io/ent/dialect/entsql"
"entgo.io/ent/schema/edge"
Expand Down Expand Up @@ -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(),
Expand Down
21 changes: 21 additions & 0 deletions ent/schema/shared.go
Original file line number Diff line number Diff line change
@@ -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()
}
Comment on lines +19 to +21
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the current time UTC

20 changes: 3 additions & 17 deletions ent/schema/user.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package schema

import (
"math/rand"
"time"

"entgo.io/ent"
"entgo.io/ent/dialect/entsql"
"entgo.io/ent/schema/edge"
Expand Down Expand Up @@ -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),
}
}

Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion internal/interactor/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/interactor/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/interactor/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/server/api/v1/search/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/server/api/v1/sync/syncher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/server/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}()
Expand Down