Fix

Author: easyCZ

.idea/misc.xml

@@ -3,6 +3,7 @@ module github.com/gitpod-io/gitpod/gitpod-db
 go 1.17
 
 require (
+	github.com/google/uuid v1.3.0
 	github.com/stretchr/testify v1.7.1
 	gorm.io/driver/mysql v1.3.2
 	gorm.io/gorm v1.23.3

components/gitpod-db-go/go.mod

@@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=

components/gitpod-db-go/go.sum

@@ -2,14 +2,15 @@ package db
 
 import (
 	"context"
+	"github.com/google/uuid"
 )
 
 type Team struct {
-	ID            string `gorm:"primaryKey"`
+	ID            uuid.UUID `gorm:"primaryKey"`
 	Name          string
 	Slug          string
 	CreationTime  StringlyTime `gorm:"column:creationTime"`
-	MarkedDeleted bool
+	MarkedDeleted bool         `gorm:"column:markedDeleted"`
 }
 
 // TableName overrides default GORM handling of table name generation

components/gitpod-db-go/team.go

@@ -1,10 +1,11 @@
 package db
 
 import (
-	"fmt"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"os"
 	"testing"
+	"time"
 )
 
 func TestTeam(t *testing.T) {
@@ -20,9 +21,39 @@ func TestTeam(t *testing.T) {
 	require.NoError(t, err)
 
 	team := Team{}
-	if tx := db.First(&team); tx.Error != nil {
-		require.NoError(t, tx.Error)
+	tx := db.First(&team)
+	require.NoError(t, tx.Error)
+
+	teamToCreate := Team{
+		ID:            uuid.New(),
+		Name:          "foo-bar",
+		Slug:          "foobar",
+		CreationTime:  NewStringlyTime(time.Now()),
+		MarkedDeleted: false,
 	}
+	tx = db.Create(&teamToCreate)
+	require.NoError(t, tx.Error)
+}
+
+func TestTeam_Create(t *testing.T) {
+	pass := os.Getenv("MYSQL_DB_PASS")
+	require.NotEmpty(t, pass)
+
+	db, err := Connect(ConnectionParams{
+		User:     "gitpod",
+		Password: pass,
+		Host:     "tcp(127.0.0.1:3306)",
+		Database: "gitpod",
+	})
+	require.NoError(t, err)
 
-	fmt.Println(team)
+	team := Team{
+		ID:            uuid.New(),
+		Name:          "foo-bar",
+		Slug:          "foobar",
+		CreationTime:  NewStringlyTime(time.Now()),
+		MarkedDeleted: false,
+	}
+	tx := db.Create(&team)
+	require.NoError(t, tx.Error)
 }

components/gitpod-db-go/team_test.go

@@ -0,0 +1,42 @@
+package db
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"time"
+)
+
+func NewStringlyTime(t time.Time) StringlyTime {
+	return StringlyTime(t)
+}
+
+// StringlyTime exists for cases where records are inserted into the DB as VARCHAR but actually contain a timestamp which is time.RFC3339
+type StringlyTime time.Time
+
+// Scan implements the Scanner interface.
+func (n StringlyTime) Scan(value interface{}) error {
+	if value == nil {
+		return fmt.Errorf("nil value")
+	}
+
+	switch s := value.(type) {
+	case []uint8:
+		parsed, err := time.Parse(time.RFC3339, string(s))
+		if err != nil {
+			return fmt.Errorf("failed to parse %v: %w", value, err)
+		}
+		n = StringlyTime(parsed)
+	}
+
+	return nil
+}
+
+// Value implements the driver Valuer interface.
+func (n StringlyTime) Value() (driver.Value, error) {
+
+	return time.Time(n).UTC(), nil
+}
+
+//func (n *StringlyTime) String() string {
+//	return n.Time.Format(time.RFC3339)
+//}