From 96bcbbba686370a0423b5fbfd9fe0469c0098f1e Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 19 Jun 2023 00:54:09 +0800 Subject: [PATCH] refactor: add api v1 package --- api/v1/common.go | 21 ++++++++ api/v1/user.go | 106 +++++++++++++++++++++++++++++++++++++++++ api/v1/user_setting.go | 69 +++++++++++++++++++++++++++ api/v1/v1.go | 23 +++++++++ cmd/server.go | 12 ++++- go.mod | 17 ++++--- go.sum | 36 +++++++------- server/server.go | 25 ++++------ store/store.go | 5 ++ 9 files changed, 272 insertions(+), 42 deletions(-) create mode 100644 api/v1/common.go create mode 100644 api/v1/user.go create mode 100644 api/v1/user_setting.go create mode 100644 api/v1/v1.go diff --git a/api/v1/common.go b/api/v1/common.go new file mode 100644 index 0000000..850164a --- /dev/null +++ b/api/v1/common.go @@ -0,0 +1,21 @@ +package v1 + +// RowStatus is the status for a row. +type RowStatus string + +const ( + // Normal is the status for a normal row. + Normal RowStatus = "NORMAL" + // Archived is the status for an archived row. + Archived RowStatus = "ARCHIVED" +) + +func (e RowStatus) String() string { + switch e { + case Normal: + return "NORMAL" + case Archived: + return "ARCHIVED" + } + return "" +} diff --git a/api/v1/user.go b/api/v1/user.go new file mode 100644 index 0000000..07f9945 --- /dev/null +++ b/api/v1/user.go @@ -0,0 +1,106 @@ +package v1 + +import ( + "fmt" + + "github.com/boojack/shortify/common" + "github.com/labstack/echo/v4" +) + +// Role is the type of a role. +type Role string + +const ( + // RoleAdmin is the ADMIN role. + RoleAdmin Role = "ADMIN" + // RoleUser is the USER role. + RoleUser Role = "USER" +) + +func (e Role) String() string { + switch e { + case RoleAdmin: + return "ADMIN" + case RoleUser: + return "USER" + } + return "USER" +} + +type User struct { + ID int `json:"id"` + + // Standard fields + CreatedTs int64 `json:"createdTs"` + UpdatedTs int64 `json:"updatedTs"` + RowStatus RowStatus `json:"rowStatus"` + + // Domain specific fields + Email string `json:"email"` + DisplayName string `json:"displayName"` + PasswordHash string `json:"-"` + OpenID string `json:"openId"` + Role Role `json:"role"` + UserSettingList []*UserSetting `json:"userSettingList"` +} + +type UserCreate struct { + Email string `json:"email"` + DisplayName string `json:"displayName"` + Password string `json:"password"` + PasswordHash string `json:"-"` + OpenID string `json:"-"` + Role Role `json:"-"` +} + +func (create UserCreate) Validate() error { + if len(create.Email) < 3 { + return fmt.Errorf("email is too short, minimum length is 6") + } + if !common.ValidateEmail(create.Email) { + return fmt.Errorf("invalid email format") + } + if len(create.Password) < 3 { + return fmt.Errorf("password is too short, minimum length is 6") + } + + return nil +} + +type UserPatch struct { + ID int + + // Standard fields + RowStatus *RowStatus `json:"rowStatus"` + + // Domain specific fields + Email *string `json:"email"` + DisplayName *string `json:"displayName"` + Password *string `json:"password"` + ResetOpenID *bool `json:"resetOpenId"` + PasswordHash *string `json:"-"` + OpenID *string `json:"-"` +} + +type UserFind struct { + ID *int `json:"id"` + + // Standard fields + RowStatus *RowStatus `json:"rowStatus"` + + // Domain specific fields + Email *string `json:"email"` + DisplayName *string `json:"displayName"` + OpenID *string `json:"openId"` + Role *Role `json:"-"` +} + +type UserDelete struct { + ID int +} + +func (*APIV1Service) RegisterUserRoutes(g *echo.Group) { + g.GET("/user", func(c echo.Context) error { + return c.String(200, "GET /user") + }) +} diff --git a/api/v1/user_setting.go b/api/v1/user_setting.go new file mode 100644 index 0000000..b0c8d91 --- /dev/null +++ b/api/v1/user_setting.go @@ -0,0 +1,69 @@ +package v1 + +import ( + "encoding/json" + "fmt" +) + +type UserSettingKey string + +const ( + // UserSettingLocaleKey is the key type for user locale. + UserSettingLocaleKey UserSettingKey = "locale" +) + +// String returns the string format of UserSettingKey type. +func (key UserSettingKey) String() string { + if key == UserSettingLocaleKey { + return "locale" + } + return "" +} + +var ( + UserSettingLocaleValue = []string{"en", "zh"} +) + +type UserSetting struct { + UserID int + Key UserSettingKey `json:"key"` + // Value is a JSON string with basic value + Value string `json:"value"` +} + +type UserSettingUpsert struct { + UserID int + Key UserSettingKey `json:"key"` + Value string `json:"value"` +} + +func (upsert UserSettingUpsert) Validate() error { + if upsert.Key == UserSettingLocaleKey { + localeValue := "en" + err := json.Unmarshal([]byte(upsert.Value), &localeValue) + if err != nil { + return fmt.Errorf("failed to unmarshal user setting locale value") + } + + invalid := true + for _, value := range UserSettingLocaleValue { + if localeValue == value { + invalid = false + break + } + } + if invalid { + return fmt.Errorf("invalid user setting locale value") + } + } else { + return fmt.Errorf("invalid user setting key") + } + + return nil +} + +type UserSettingFind struct { + UserID int + + Key *UserSettingKey `json:"key"` +} diff --git a/api/v1/v1.go b/api/v1/v1.go new file mode 100644 index 0000000..a9b5222 --- /dev/null +++ b/api/v1/v1.go @@ -0,0 +1,23 @@ +package v1 + +import ( + "github.com/boojack/shortify/server/profile" + "github.com/boojack/shortify/store" + "github.com/labstack/echo/v4" +) + +type APIV1Service struct { + Profile *profile.Profile + Store *store.Store +} + +func NewAPIV1Service(profile *profile.Profile, store *store.Store) *APIV1Service { + return &APIV1Service{ + Profile: profile, + Store: store, + } +} + +func (s *APIV1Service) Start(apiV1Group *echo.Group) { + s.RegisterUserRoutes(apiV1Group) +} diff --git a/cmd/server.go b/cmd/server.go index ef068f2..e82607d 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -13,6 +13,8 @@ import ( "github.com/boojack/shortify/server" _profile "github.com/boojack/shortify/server/profile" + "github.com/boojack/shortify/store" + "github.com/boojack/shortify/store/db" ) const ( @@ -37,7 +39,15 @@ var ( Short: "", Run: func(_cmd *cobra.Command, _args []string) { ctx, cancel := context.WithCancel(context.Background()) - s, err := server.NewServer(ctx, profile) + db := db.NewDB(profile) + if err := db.Open(ctx); err != nil { + cancel() + fmt.Printf("failed to open db, error: %+v\n", err) + return + } + + storeInstance := store.New(db.DBInstance, profile) + s, err := server.NewServer(profile, storeInstance) if err != nil { cancel() fmt.Printf("failed to create server, error: %+v\n", err) diff --git a/go.mod b/go.mod index 143c117..5834d8b 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,13 @@ require github.com/google/uuid v1.3.0 require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.6.0 - golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/crypto v0.9.0 + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect ) @@ -29,7 +29,7 @@ require ( github.com/labstack/echo-contrib v0.14.0 github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.1 + github.com/stretchr/testify v1.8.4 ) require ( @@ -41,7 +41,7 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/spf13/afero v1.9.3 // indirect @@ -49,7 +49,7 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/tools v0.6.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/uint128 v1.2.0 // indirect @@ -64,7 +64,6 @@ require ( ) require ( - github.com/pkg/errors v0.9.1 golang.org/x/mod v0.8.0 modernc.org/sqlite v1.23.1 ) diff --git a/go.sum b/go.sum index 869e0ba..27c6836 100644 --- a/go.sum +++ b/go.sum @@ -162,14 +162,13 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -202,8 +201,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -228,8 +228,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -296,8 +296,8 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -317,6 +317,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -356,8 +357,9 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -365,8 +367,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -419,8 +421,8 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/server/server.go b/server/server.go index 5d85684..af204b7 100644 --- a/server/server.go +++ b/server/server.go @@ -2,14 +2,12 @@ package server import ( "context" - "database/sql" "fmt" "time" + apiv1 "github.com/boojack/shortify/api/v1" "github.com/boojack/shortify/server/profile" "github.com/boojack/shortify/store" - "github.com/boojack/shortify/store/db" - "github.com/pkg/errors" "github.com/gorilla/securecookie" "github.com/gorilla/sessions" @@ -19,31 +17,23 @@ import ( ) type Server struct { - e *echo.Echo - db *sql.DB + e *echo.Echo Profile *profile.Profile Store *store.Store } -func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) { +func NewServer(profile *profile.Profile, store *store.Store) (*Server, error) { e := echo.New() e.Debug = true e.HideBanner = true e.HidePort = true - db := db.NewDB(profile) - if err := db.Open(ctx); err != nil { - return nil, errors.Wrap(err, "cannot open db") - } - s := &Server{ e: e, - db: db.DBInstance, Profile: profile, + Store: store, } - storeInstance := store.New(db.DBInstance, profile) - s.Store = storeInstance e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{ Format: `{"time":"${time_rfc3339}",` + @@ -87,6 +77,11 @@ func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) { s.registerWorkspaceUserRoutes(apiGroup) s.registerShortcutRoutes(apiGroup) + // Register API v1 routes. + apiV1Service := apiv1.NewAPIV1Service(profile, store) + apiV1Group := apiGroup.Group("/api/v1") + apiV1Service.RegisterUserRoutes(apiV1Group) + return s, nil } @@ -104,7 +99,7 @@ func (s *Server) Shutdown(ctx context.Context) { } // Close database connection - if err := s.db.Close(); err != nil { + if err := s.Store.Close(); err != nil { fmt.Printf("failed to close database, error: %v\n", err) } diff --git a/store/store.go b/store/store.go index 058bcf2..936d79a 100644 --- a/store/store.go +++ b/store/store.go @@ -24,3 +24,8 @@ func New(db *sql.DB, profile *profile.Profile) *Store { profile: profile, } } + +// Close closes the database connection. +func (s *Store) Close() error { + return s.db.Close() +}