From 93389c1ddfab7414585354b4dfd2d06ecab7d848 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:03:21 +0700 Subject: [PATCH 01/61] Initial structure project --- .env | 0 CHANGELOG.md | 10 ++++++++++ Makefile | 0 cmd/CHANGELOG.md | 10 ++++++++++ cmd/main.go | 1 + go.mod | 3 +++ 6 files changed, 24 insertions(+) create mode 100644 .env create mode 100644 CHANGELOG.md create mode 100644 Makefile create mode 100644 cmd/CHANGELOG.md create mode 100644 cmd/main.go create mode 100644 go.mod diff --git a/.env b/.env new file mode 100644 index 000000000..e69de29bb diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..d7c6928fa --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Initial and structure for project diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/CHANGELOG.md b/cmd/CHANGELOG.md new file mode 100644 index 000000000..1a47be96d --- /dev/null +++ b/cmd/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create `main` diff --git a/cmd/main.go b/cmd/main.go new file mode 100644 index 000000000..06ab7d0f9 --- /dev/null +++ b/cmd/main.go @@ -0,0 +1 @@ +package main diff --git a/go.mod b/go.mod new file mode 100644 index 000000000..e80fc580d --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module example.com/m/v2 + +go 1.17 From 8037ea3e3f50707130d29c114c71f017784c2bdb Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:16:25 +0700 Subject: [PATCH 02/61] Create file and CHANGELOG for structure --- .env | 19 +++++++++++++++++++ constants/CHANGELOG.md | 10 ++++++++++ constants/constants.go | 1 + internal/driver/CHANGELOG.md | 10 ++++++++++ internal/driver/driver.go | 1 + internal/repositories/auth/CHANGELOG.md | 10 ++++++++++ internal/repositories/auth/auth.go | 1 + internal/repositories/task/CHANGELOG.md | 10 ++++++++++ internal/repositories/task/task.go | 1 + internal/repositories/user/CHANGELOG.md | 10 ++++++++++ internal/repositories/user/user.go | 1 + internal/usecases/auth/CHANGELOG.md | 10 ++++++++++ internal/usecases/auth/auth.go | 1 + internal/usecases/auth/interface.go | 1 + internal/usecases/task/CHANGELOG.md | 10 ++++++++++ internal/usecases/task/interface.go | 1 + internal/usecases/task/task.go | 1 + internal/usecases/user/CHANGELOG.md | 10 ++++++++++ internal/usecases/user/interface.go | 1 + internal/usecases/user/user.go | 1 + 20 files changed, 110 insertions(+) create mode 100644 constants/CHANGELOG.md create mode 100644 constants/constants.go create mode 100644 internal/driver/CHANGELOG.md create mode 100644 internal/driver/driver.go create mode 100644 internal/repositories/auth/CHANGELOG.md create mode 100644 internal/repositories/auth/auth.go create mode 100644 internal/repositories/task/CHANGELOG.md create mode 100644 internal/repositories/task/task.go create mode 100644 internal/repositories/user/CHANGELOG.md create mode 100644 internal/repositories/user/user.go create mode 100644 internal/usecases/auth/CHANGELOG.md create mode 100644 internal/usecases/auth/auth.go create mode 100644 internal/usecases/auth/interface.go create mode 100644 internal/usecases/task/CHANGELOG.md create mode 100644 internal/usecases/task/interface.go create mode 100644 internal/usecases/task/task.go create mode 100644 internal/usecases/user/CHANGELOG.md create mode 100644 internal/usecases/user/interface.go create mode 100644 internal/usecases/user/user.go diff --git a/.env b/.env index e69de29bb..8f6c3eec0 100644 --- a/.env +++ b/.env @@ -0,0 +1,19 @@ +# Common +PORT=8000 + +# JWT +JWT_KEY=eyJhbGciOiJIUzI1NiJ9 +JWT_TIMEOUT=60 + +# Setup DB +DB_DRIVER="postgres" +DB_HOST="localhost" +DB_PORT=5432 +DB_USER="postgres" +DB_PASSWORD="tinproqn113" +DB_NAME="todo" +DB_SSL_MODE="disable" +DSN_POSTGRES="host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE}" + +# URL for migration +POSTGRESQL_URL_MIGRATION="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSL_MODE}" \ No newline at end of file diff --git a/constants/CHANGELOG.md b/constants/CHANGELOG.md new file mode 100644 index 000000000..56a9f2b9c --- /dev/null +++ b/constants/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `constants.go` diff --git a/constants/constants.go b/constants/constants.go new file mode 100644 index 000000000..1255fc8ba --- /dev/null +++ b/constants/constants.go @@ -0,0 +1 @@ +package constants diff --git a/internal/driver/CHANGELOG.md b/internal/driver/CHANGELOG.md new file mode 100644 index 000000000..2743534c8 --- /dev/null +++ b/internal/driver/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `driver.go` diff --git a/internal/driver/driver.go b/internal/driver/driver.go new file mode 100644 index 000000000..bce7c468b --- /dev/null +++ b/internal/driver/driver.go @@ -0,0 +1 @@ +package driver diff --git a/internal/repositories/auth/CHANGELOG.md b/internal/repositories/auth/CHANGELOG.md new file mode 100644 index 000000000..07ddfde6d --- /dev/null +++ b/internal/repositories/auth/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `task.go` diff --git a/internal/repositories/auth/auth.go b/internal/repositories/auth/auth.go new file mode 100644 index 000000000..8832b06d1 --- /dev/null +++ b/internal/repositories/auth/auth.go @@ -0,0 +1 @@ +package auth diff --git a/internal/repositories/task/CHANGELOG.md b/internal/repositories/task/CHANGELOG.md new file mode 100644 index 000000000..07ddfde6d --- /dev/null +++ b/internal/repositories/task/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `task.go` diff --git a/internal/repositories/task/task.go b/internal/repositories/task/task.go new file mode 100644 index 000000000..b028dfdfc --- /dev/null +++ b/internal/repositories/task/task.go @@ -0,0 +1 @@ +package task diff --git a/internal/repositories/user/CHANGELOG.md b/internal/repositories/user/CHANGELOG.md new file mode 100644 index 000000000..aab832225 --- /dev/null +++ b/internal/repositories/user/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `user.go` diff --git a/internal/repositories/user/user.go b/internal/repositories/user/user.go new file mode 100644 index 000000000..a00006b65 --- /dev/null +++ b/internal/repositories/user/user.go @@ -0,0 +1 @@ +package user diff --git a/internal/usecases/auth/CHANGELOG.md b/internal/usecases/auth/CHANGELOG.md new file mode 100644 index 000000000..f53c5746c --- /dev/null +++ b/internal/usecases/auth/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `interface.go` and `auth.go` diff --git a/internal/usecases/auth/auth.go b/internal/usecases/auth/auth.go new file mode 100644 index 000000000..8832b06d1 --- /dev/null +++ b/internal/usecases/auth/auth.go @@ -0,0 +1 @@ +package auth diff --git a/internal/usecases/auth/interface.go b/internal/usecases/auth/interface.go new file mode 100644 index 000000000..8832b06d1 --- /dev/null +++ b/internal/usecases/auth/interface.go @@ -0,0 +1 @@ +package auth diff --git a/internal/usecases/task/CHANGELOG.md b/internal/usecases/task/CHANGELOG.md new file mode 100644 index 000000000..8d079d247 --- /dev/null +++ b/internal/usecases/task/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `interface.go` and `task.go` diff --git a/internal/usecases/task/interface.go b/internal/usecases/task/interface.go new file mode 100644 index 000000000..b028dfdfc --- /dev/null +++ b/internal/usecases/task/interface.go @@ -0,0 +1 @@ +package task diff --git a/internal/usecases/task/task.go b/internal/usecases/task/task.go new file mode 100644 index 000000000..b028dfdfc --- /dev/null +++ b/internal/usecases/task/task.go @@ -0,0 +1 @@ +package task diff --git a/internal/usecases/user/CHANGELOG.md b/internal/usecases/user/CHANGELOG.md new file mode 100644 index 000000000..0e93fb24e --- /dev/null +++ b/internal/usecases/user/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create file `interface.go` and `user.go` diff --git a/internal/usecases/user/interface.go b/internal/usecases/user/interface.go new file mode 100644 index 000000000..a00006b65 --- /dev/null +++ b/internal/usecases/user/interface.go @@ -0,0 +1 @@ +package user diff --git a/internal/usecases/user/user.go b/internal/usecases/user/user.go new file mode 100644 index 000000000..a00006b65 --- /dev/null +++ b/internal/usecases/user/user.go @@ -0,0 +1 @@ +package user From f138524c3d19e5449a42664f0814787196b9fec3 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:25:30 +0700 Subject: [PATCH 03/61] Create connection to database --- cmd/CHANGELOG.md | 1 + cmd/main.go | 39 ++++++++++++++ constants/CHANGELOG.md | 1 + constants/constants.go | 23 +++++++++ go.mod | 28 ++++++++++ go.sum | 106 ++++++++++++++++++++++++++++++++++++++ internal/driver/driver.go | 39 ++++++++++++++ utils/CHANGELOG.md | 10 ++++ utils/utils.go | 78 ++++++++++++++++++++++++++++ utils/utils_test.go | 52 +++++++++++++++++++ 10 files changed, 377 insertions(+) create mode 100644 go.sum create mode 100644 utils/CHANGELOG.md create mode 100644 utils/utils.go create mode 100644 utils/utils_test.go diff --git a/cmd/CHANGELOG.md b/cmd/CHANGELOG.md index 1a47be96d..09c172e50 100644 --- a/cmd/CHANGELOG.md +++ b/cmd/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Create connection to database postgres - Create `main` diff --git a/cmd/main.go b/cmd/main.go index 06ab7d0f9..a388cd4b8 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1 +1,40 @@ package main + +import ( + "fmt" + "log" + + "example.com/m/v2/constants" + "example.com/m/v2/internal/driver" + "example.com/m/v2/utils" + + "github.com/gin-gonic/gin" + "github.com/pkg/errors" +) + +func run() error { + // Creates a new Gin instance. + r := gin.Default() + + // Load File Environment + utils.LoadEnv(constants.FileEnvironment) + + // Connect to Database + db, err := driver.ConnectDatabase() + if err != nil { + return errors.Wrap(err, "Fail to ConnectDatabase") + } + + r.Use(func(c *gin.Context) { + c.Set("db", db) + }) + + log.Fatal(r.Run(fmt.Sprintf(":%s", utils.Env.Port))) + return nil +} + +func main() { + if err := run(); err != nil { + log.Fatal(err) + } +} diff --git a/constants/CHANGELOG.md b/constants/CHANGELOG.md index 56a9f2b9c..40138c1ea 100644 --- a/constants/CHANGELOG.md +++ b/constants/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Create variable to get `.env` - Create file `constants.go` diff --git a/constants/constants.go b/constants/constants.go index 1255fc8ba..4d85500ac 100644 --- a/constants/constants.go +++ b/constants/constants.go @@ -1 +1,24 @@ package constants + +const ( + FileEnvironment = "../.env" + DsnEnvironment = "DSN_POSTGRES" +) + +// Response +const ( + ResponseStatus = "status" + + // Error + ResponseError = "error" + ResponseErrorDetail = "error_detail" + + // Ok + ResponseMessage = "message" + ResponseData = "data" +) + +// Key Cookie +const ( + CookieTokenKey string = "token" +) diff --git a/go.mod b/go.mod index e80fc580d..b279a2b8f 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,31 @@ module example.com/m/v2 go 1.17 + +require ( + github.com/caarlos0/env v3.5.0+incompatible // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gin-gonic/gin v1.8.1 // indirect + github.com/go-playground/locales v0.14.0 // indirect + github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/go-playground/validator/v10 v10.10.0 // indirect + github.com/goccy/go-json v0.9.7 // indirect + github.com/jinzhu/gorm v1.9.16 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/joho/godotenv v1.4.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/lib/pq v1.1.1 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/ugorji/go/codec v1.2.7 // indirect + golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect + golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 000000000..7d09ef336 --- /dev/null +++ b/go.sum @@ -0,0 +1,106 @@ +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs= +github.com/caarlos0/env v3.5.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= +github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0= +github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= +github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= +github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= +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.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= +github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= +github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +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/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/driver/driver.go b/internal/driver/driver.go index bce7c468b..ee18a13d0 100644 --- a/internal/driver/driver.go +++ b/internal/driver/driver.go @@ -1 +1,40 @@ package driver + +import ( + "fmt" + + "example.com/m/v2/utils" + + "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/postgres" + "github.com/pkg/errors" +) + +var DB *gorm.DB + +// Connect to Database postgres +func ConnectDatabase() (*gorm.DB, error) { + dsn := "" + switch utils.Env.DBDriver { + case "postgres": + dsn = utils.Env.DSNPostgres + //To Do for another database + default: + return nil, errors.New("cannot find db driver") + } + + database, err := gorm.Open(utils.Env.DBDriver, dsn) + if err != nil { + return nil, errors.Wrap(err, "Fail to Connect Database!") + } + + if err := database.DB().Ping(); err != nil { + return nil, err + } + + DB = database + fmt.Println("Connection DB Complete") + + return database, nil + +} diff --git a/utils/CHANGELOG.md b/utils/CHANGELOG.md new file mode 100644 index 000000000..523c2843a --- /dev/null +++ b/utils/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create func for Load file and get variable from `.env` diff --git a/utils/utils.go b/utils/utils.go new file mode 100644 index 000000000..920e8a068 --- /dev/null +++ b/utils/utils.go @@ -0,0 +1,78 @@ +package utils + +import ( + "log" + "os" + + "github.com/caarlos0/env" + "github.com/joho/godotenv" +) + +func SafeString(s *string) string { + if s == nil { + return "" + } + + return *s +} + +func String(s string) *string { + return &s +} + +// --Remove Duplicate Data +func RemoveDuplicate(s []string) []string { + inResult := make(map[string]bool) + var result []string + for _, str := range s { + if _, ok := inResult[str]; !ok { + inResult[str] = true + result = append(result, str) + } + } + return result +} + +type Environment struct { + Port string `env:"PORT"` + JwtKey string `env:"JWT_KEY"` + JwtTimeout string `env:"JWT_TIMEOUT"` + DBDriver string `env:"DB_DRIVER"` + DBHost string `env:"DB_HOST"` + DBPort string `env:"DB_PORT"` + DBUser string `env:"DB_USER"` + DBPassword string `env:"DB_PASSWORD"` + DBName string `env:"DB_NAME"` + DBSslMode string `env:"DB_SSL_MODE"` + DSNPostgres string `env:"DSN_POSTGRES"` +} + +var Env *Environment + +func LoadEnv(file string) { + err := godotenv.Load(file) + if err != nil { + log.Fatalf("Some error occured. Err: %s", err) + } + + if Env == nil { + Env = new(Environment) + } + + getEnvironmentFromEnv(Env) +} + +func GetEnv(key string) string { + value, ok := os.LookupEnv(key) + if !ok { + log.Fatalf("Missing or invalid environment key: '%s'", key) + } + return value +} + +func getEnvironmentFromEnv(object *Environment) { + if object == nil { + return + } + env.Parse(object) +} diff --git a/utils/utils_test.go b/utils/utils_test.go new file mode 100644 index 000000000..a22edf478 --- /dev/null +++ b/utils/utils_test.go @@ -0,0 +1,52 @@ +package utils + +import ( + "reflect" + "testing" +) + +func TestSafeString(t *testing.T) { + type args struct { + s *string + } + tests := []struct { + name string + args args + want string + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := SafeString(tt.args.s); got != tt.want { + t.Errorf("SafeString() = %v, want %v", got, tt.want) + } + }) + } +} + +func TestRemoveDuplicate(t *testing.T) { + type args struct { + s []string + } + tests := []struct { + name string + args args + want []string + }{ + { + name: "Success case 1", + args: args{ + []string{"1", "2", "3", "1"}, + }, + want: []string{"1", "2", "3"}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := RemoveDuplicate(tt.args.s); !reflect.DeepEqual(got, tt.want) { + t.Errorf("RemoveDuplicate() = %v, want %v", got, tt.want) + } + }) + } +} From 67322194f422f90d84dc037e6fc864ecad99a65a Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:33:07 +0700 Subject: [PATCH 04/61] Create models and usecase for `task`, `user` --- internal/models/CHANGELOG.md | 10 +++++++++ internal/models/task.go | 8 +++++++ internal/models/user.go | 8 +++++++ internal/repositories/CHANGELOG.md | 10 +++++++++ internal/usecases/task/CHANGELOG.md | 1 + internal/usecases/task/interface.go | 17 ++++++++++++++ internal/usecases/task/task.go | 27 ++++++++++++++++++++++ internal/usecases/user/CHANGELOG.md | 1 + internal/usecases/user/interface.go | 18 +++++++++++++++ internal/usecases/user/user.go | 35 +++++++++++++++++++++++++++++ 10 files changed, 135 insertions(+) create mode 100644 internal/models/CHANGELOG.md create mode 100644 internal/models/task.go create mode 100644 internal/models/user.go create mode 100644 internal/repositories/CHANGELOG.md diff --git a/internal/models/CHANGELOG.md b/internal/models/CHANGELOG.md new file mode 100644 index 000000000..67337fc69 --- /dev/null +++ b/internal/models/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create models `user` and `task` diff --git a/internal/models/task.go b/internal/models/task.go new file mode 100644 index 000000000..2a53dfa22 --- /dev/null +++ b/internal/models/task.go @@ -0,0 +1,8 @@ +package models + +type Task struct { + ID string `json:"id,omitempty"` + Content string `json:"content,omitempty"` + CreateDate string `json:"create_date,omitempty"` + UserID string `json:"user_id,omitempty"` +} diff --git a/internal/models/user.go b/internal/models/user.go new file mode 100644 index 000000000..a100dd40a --- /dev/null +++ b/internal/models/user.go @@ -0,0 +1,8 @@ +package models + +type User struct { + ID string `json:"id,omitempty"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + MaxTaskPerDay int `json:"max_task_per_day,omitempty"` +} diff --git a/internal/repositories/CHANGELOG.md b/internal/repositories/CHANGELOG.md new file mode 100644 index 000000000..c938fb3d6 --- /dev/null +++ b/internal/repositories/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Create folder `user`, `task`, `auth` diff --git a/internal/usecases/task/CHANGELOG.md b/internal/usecases/task/CHANGELOG.md index 8d079d247..64dc36dc6 100644 --- a/internal/usecases/task/CHANGELOG.md +++ b/internal/usecases/task/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Implement `TaskRepository` and `TaskUseCase` - Create file `interface.go` and `task.go` diff --git a/internal/usecases/task/interface.go b/internal/usecases/task/interface.go index b028dfdfc..f13d2ee6a 100644 --- a/internal/usecases/task/interface.go +++ b/internal/usecases/task/interface.go @@ -1 +1,18 @@ package task + +import ( + "example.com/m/v2/internal/models" +) + +type Reader interface { + FindTaskByUser(username, createDate string) ([]models.Task, error) +} + +type Writer interface { + AddTask(task *models.Task) error +} + +type TaskRepository interface { + Reader + Writer +} diff --git a/internal/usecases/task/task.go b/internal/usecases/task/task.go index b028dfdfc..fd8045296 100644 --- a/internal/usecases/task/task.go +++ b/internal/usecases/task/task.go @@ -1 +1,28 @@ package task + +import ( + "example.com/m/v2/internal/models" +) + +// TaskUseCaseUsecase is the definition for collection of methods related to the `users` table use case +type TaskUseCase interface { + FindTaskByUser(userID, createDate string) ([]models.Task, error) + AddTask(task *models.Task) error +} + +type taskUseCaseRepository struct { + repository TaskRepository +} + +// NewUserUsecase returns a UserUsecase attached with methods related to the `users` table use case +func NewTaskUseCase(repository TaskRepository) TaskUseCase { + return &taskUseCaseRepository{repository: repository} +} + +func (r *taskUseCaseRepository) FindTaskByUser(userID, createDate string) ([]models.Task, error) { + return r.repository.FindTaskByUser(userID, createDate) +} + +func (r *taskUseCaseRepository) AddTask(task *models.Task) error { + return r.repository.AddTask(task) +} diff --git a/internal/usecases/user/CHANGELOG.md b/internal/usecases/user/CHANGELOG.md index 0e93fb24e..c942a6354 100644 --- a/internal/usecases/user/CHANGELOG.md +++ b/internal/usecases/user/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Implement `UserRepository` and `UserUseCase` - Create file `interface.go` and `user.go` diff --git a/internal/usecases/user/interface.go b/internal/usecases/user/interface.go index a00006b65..a21e7b5a1 100644 --- a/internal/usecases/user/interface.go +++ b/internal/usecases/user/interface.go @@ -1 +1,19 @@ package user + +import ( + "example.com/m/v2/internal/models" +) + +type Reader interface { + GetByUsername(username string) (*models.User, error) + Login(username, password string) (*models.User, error) +} + +type Writer interface { + Create(u *models.User) error +} + +type UserRepository interface { + Reader + Writer +} diff --git a/internal/usecases/user/user.go b/internal/usecases/user/user.go index a00006b65..6610dcfb0 100644 --- a/internal/usecases/user/user.go +++ b/internal/usecases/user/user.go @@ -1 +1,36 @@ package user + +import ( + "example.com/m/v2/internal/models" +) + +// UserUsecase is the definition for collection of methods related to the `users` table use case +type UserUseCase interface { + Login(username, password string) (*models.User, error) + GetUserByUsername(username string) (*models.User, error) + Create(u *models.User) error +} + +type userUseCaseRepository struct { + repository UserRepository +} + +// NewUserUsecase returns a UserUsecase attached with methods related to the `users` table use case +func NewUserUseCase(repository UserRepository) UserUseCase { + return &userUseCaseRepository{repository: repository} +} + +// GetUserByUsername implements UserUseCase +func (uc *userUseCaseRepository) GetUserByUsername(username string) (*models.User, error) { + return uc.repository.GetByUsername(username) +} + +// Login implements UserUseCase +func (uc *userUseCaseRepository) Login(username, password string) (*models.User, error) { + return uc.repository.Login(username, password) +} + +// Create implements UserUseCase +func (uc *userUseCaseRepository) Create(u *models.User) error { + return uc.repository.Create(u) +} From 364a9eed73baf56e3296bb3a5f9a4d26a811a658 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:36:38 +0700 Subject: [PATCH 05/61] Make create uuid --- go.mod | 5 +++++ go.sum | 9 +++++++++ internal/pkg/CHANGELOG.md | 10 +++++++++ internal/pkg/id/CHANGELOG.md | 10 +++++++++ internal/pkg/id/id.go | 18 +++++++++++++++++ internal/pkg/id/id_test.go | 37 ++++++++++++++++++++++++++++++++++ internal/usecases/CHANGELOG.md | 10 +++++++++ 7 files changed, 99 insertions(+) create mode 100644 internal/pkg/CHANGELOG.md create mode 100644 internal/pkg/id/CHANGELOG.md create mode 100644 internal/pkg/id/id.go create mode 100644 internal/pkg/id/id_test.go create mode 100644 internal/usecases/CHANGELOG.md diff --git a/go.mod b/go.mod index b279a2b8f..4a0e86184 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,14 @@ go 1.17 require ( github.com/caarlos0/env v3.5.0+incompatible // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.8.1 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-json v0.9.7 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/joho/godotenv v1.4.0 // indirect @@ -21,6 +23,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.1 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/testify v1.7.5 // indirect github.com/ugorji/go/codec v1.2.7 // indirect golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect @@ -28,4 +32,5 @@ require ( golang.org/x/text v0.3.6 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 7d09ef336..3828851f1 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yi github.com/caarlos0/env v3.5.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= @@ -25,6 +26,8 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +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/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -56,14 +59,18 @@ github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZO github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= +github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= @@ -104,3 +111,5 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/pkg/CHANGELOG.md b/internal/pkg/CHANGELOG.md new file mode 100644 index 000000000..2019d150f --- /dev/null +++ b/internal/pkg/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `uuid` diff --git a/internal/pkg/id/CHANGELOG.md b/internal/pkg/id/CHANGELOG.md new file mode 100644 index 000000000..19753ce67 --- /dev/null +++ b/internal/pkg/id/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create uuid diff --git a/internal/pkg/id/id.go b/internal/pkg/id/id.go new file mode 100644 index 000000000..1bc9f77c8 --- /dev/null +++ b/internal/pkg/id/id.go @@ -0,0 +1,18 @@ +package id + +import "github.com/google/uuid" + +type Uid = uuid.UUID + +//NewID create a new entity Uid +func NewID() Uid { + return Uid(uuid.New()) +} + +func UUIDIsNil(id *uuid.UUID) bool { + if id == nil { + return false + } + + return *id == uuid.Nil +} diff --git a/internal/pkg/id/id_test.go b/internal/pkg/id/id_test.go new file mode 100644 index 000000000..a34fc46e9 --- /dev/null +++ b/internal/pkg/id/id_test.go @@ -0,0 +1,37 @@ +package id + +import ( + "testing" + + "github.com/google/uuid" + "github.com/stretchr/testify/require" +) + +func TestNewID(t *testing.T) { + tests := []struct { + name string + want interface{} + }{ + { + name: "Success case", + want: uuid.UUID{}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := NewID() + require.IsType(t, tt.want, got) + require.NotEqual(t, "", got) + }) + } +} + +func TestUUIDIsNil(t *testing.T) { + { //Success key + id := &uuid.UUID{} + require.Equal(t, true, UUIDIsNil(id)) + } + { //Fail key + require.Equal(t, false, UUIDIsNil(nil)) + } +} diff --git a/internal/usecases/CHANGELOG.md b/internal/usecases/CHANGELOG.md new file mode 100644 index 000000000..124fad9b7 --- /dev/null +++ b/internal/usecases/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `user`, `task` and `auth` From 9298f8d0ef1c130e61775e500d318cb5d69c3bf9 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:39:27 +0700 Subject: [PATCH 06/61] Handle func in user --- go.mod | 1 + go.sum | 2 + internal/repositories/user/CHANGELOG.md | 2 + internal/repositories/user/user.go | 76 ++++++++++++++ internal/repositories/user/user_test.go | 130 ++++++++++++++++++++++++ internal/repositories/user/var_test.go | 35 +++++++ 6 files changed, 246 insertions(+) create mode 100644 internal/repositories/user/user_test.go create mode 100644 internal/repositories/user/var_test.go diff --git a/go.mod b/go.mod index 4a0e86184..276cf36a2 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module example.com/m/v2 go 1.17 require ( + github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect github.com/caarlos0/env v3.5.0+incompatible // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gin-contrib/sse v0.1.0 // indirect diff --git a/go.sum b/go.sum index 3828851f1..81842dd8a 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs= diff --git a/internal/repositories/user/CHANGELOG.md b/internal/repositories/user/CHANGELOG.md index aab832225..76152f6a0 100644 --- a/internal/repositories/user/CHANGELOG.md +++ b/internal/repositories/user/CHANGELOG.md @@ -7,4 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create unit test +- Make create func `Create`, `Login` and `GetUser` - Create file `user.go` diff --git a/internal/repositories/user/user.go b/internal/repositories/user/user.go index a00006b65..b6b816e62 100644 --- a/internal/repositories/user/user.go +++ b/internal/repositories/user/user.go @@ -1 +1,77 @@ package user + +import ( + "example.com/m/v2/internal/models" + "example.com/m/v2/internal/pkg/id" + "example.com/m/v2/internal/usecases/user" + + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +type repository struct { + DB *gorm.DB +} + +func NewUserRepository(db *gorm.DB) user.UserRepository { + return &repository{ + DB: db, + } +} + +func New(user *models.User) *models.User { + return &models.User{ + ID: id.NewID().String(), + Username: user.Username, + Password: user.Password, + MaxTaskPerDay: user.MaxTaskPerDay, + } +} + +// GetByUsername implements user.UserRepository +func (r *repository) GetByUsername(username string) (*models.User, error) { + if username == "" { + return nil, errors.New("Input empty") + } + + user := &models.User{} + if err := r.DB.Where("username = ?", username).First(user).Error; err != nil { + return nil, errors.Wrap(err, "Fail query user") + } + + if user == nil { + return nil, errors.New("User is not exists") + } + return user, nil +} + +// Create implements user.UserRepository +func (r *repository) Create(inputUser *models.User) error { + if inputUser == nil || inputUser.Username == "" || inputUser.Password == "" { + return errors.New("Input valid") + } + + if err := r.DB.Create(inputUser).Error; err != nil { + return errors.Wrap(err, "Fail create user") + } + + return nil +} + +// Login implements user.UserRepository +func (r *repository) Login(username, password string) (*models.User, error) { + if username == "" || password == "" { + return nil, errors.New("Input empty") + } + + user := &models.User{} + if err := r.DB.Where("username = ? and password = ?", username, password).Take(user).Error; err != nil { + return nil, errors.Wrap(err, "Fail query user") + } + + if user == nil { + return nil, errors.New("User is not exists") + } + + return user, nil +} diff --git a/internal/repositories/user/user_test.go b/internal/repositories/user/user_test.go new file mode 100644 index 000000000..8e76a66fa --- /dev/null +++ b/internal/repositories/user/user_test.go @@ -0,0 +1,130 @@ +package user + +import ( + "fmt" + "regexp" + "testing" + + "example.com/m/v2/internal/models" + "github.com/DATA-DOG/go-sqlmock" + "github.com/stretchr/testify/require" +) + +func Test_repository_GetByUsername(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + + userRepository := NewUserRepository(db) + + { //Success case + input := &models.User{ + Username: "manabie_1", + Password: "manabie_1", + } + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, input.Username, input.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStats(db, input.Username, input.Password) + require.Nil(t, err) + + rows := sqlmock.NewRows([]string{"id", "username", "password", "max_task_per_day"}). + AddRow("1", input.Username, input.Password, 5) + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnRows(rows) + + user, err := userRepository.GetByUsername(input.Username) + require.Nil(t, err) + require.NotNil(t, user) + require.Equal(t, input.Username, user.Username) + require.Equal(t, input.Password, user.Password) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } + { // Fail case + input := &models.User{ + Username: "manabie_2", + Password: "manabie_2", + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnError(fmt.Errorf("invalid username")) + + user, err := userRepository.GetByUsername(input.Username) + require.NotNil(t, err) + require.Nil(t, user) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } +} + +func Test_repository_Create(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + + userRepository := NewUserRepository(db) + + { //Success case + user := New(&models.User{ + Username: "manabie_1", + Password: "manabie_1", + MaxTaskPerDay: 5, + }) + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users" ("id","username","password","max_task_per_day") VALUES ($1,$2,$3,$4) RETURNING "users"."id"`)). + WithArgs(user.ID, user.Username, user.Password, user.MaxTaskPerDay). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + + err := userRepository.Create(user) + require.Nil(t, err) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } + + { + //Fail case + user := New(&models.User{ + Username: "manabie_1", + Password: "manabie_1", + MaxTaskPerDay: 5, + }) + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users" ("id","username","password","max_task_per_day") VALUES ($1,$2,$3,$4) RETURNING "users"."id"`)). + WithArgs("1", user.Username, user.Password, user.MaxTaskPerDay). + WillReturnError(fmt.Errorf("nil user_id")) + mock.ExpectCommit() + + err := userRepository.Create(user) + require.NotNil(t, err) + require.NotNil(t, mock.ExpectationsWereMet()) + } +} diff --git a/internal/repositories/user/var_test.go b/internal/repositories/user/var_test.go new file mode 100644 index 000000000..e9b3187ea --- /dev/null +++ b/internal/repositories/user/var_test.go @@ -0,0 +1,35 @@ +package user + +import ( + "fmt" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { + sqlDB, mock, err := sqlmock.New() // mock sql.DB + if err != nil { + return nil, nil, errors.Wrap(err, "Fail connection to database") + } + + db, err := gorm.Open("postgres", sqlDB) // open gorm db + if err != nil { + return nil, nil, err + } + + if db == nil { + return nil, nil, errors.New("Fail connection to database") + } + + return db, mock, nil +} + +func recordStats(db *gorm.DB, username, password string) (err error) { + _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) + } + return +} From 449884f9342dde786c3ec719050bf240477b2ffb Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:41:07 +0700 Subject: [PATCH 07/61] Handle func in task --- internal/repositories/task/CHANGELOG.md | 2 + internal/repositories/task/task.go | 59 ++++++++++ internal/repositories/task/task_test.go | 139 ++++++++++++++++++++++++ internal/repositories/task/var_test.go | 37 +++++++ 4 files changed, 237 insertions(+) create mode 100644 internal/repositories/task/task_test.go create mode 100644 internal/repositories/task/var_test.go diff --git a/internal/repositories/task/CHANGELOG.md b/internal/repositories/task/CHANGELOG.md index 07ddfde6d..7027eb8b4 100644 --- a/internal/repositories/task/CHANGELOG.md +++ b/internal/repositories/task/CHANGELOG.md @@ -7,4 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create unit test +- Make create func `FindTaskByUser` and `AddTask` - Create file `task.go` diff --git a/internal/repositories/task/task.go b/internal/repositories/task/task.go index b028dfdfc..ce30193e5 100644 --- a/internal/repositories/task/task.go +++ b/internal/repositories/task/task.go @@ -1 +1,60 @@ package task + +import ( + "example.com/m/v2/internal/models" + "example.com/m/v2/internal/pkg/id" + "example.com/m/v2/internal/usecases/task" + + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +type repository struct { + DB *gorm.DB +} + +func NewTaskRepository(db *gorm.DB) task.TaskUseCase { + return &repository{ + DB: db, + } +} + +func NewTask(task models.Task) *models.Task { + return &models.Task{ + ID: id.NewID().String(), + Content: task.Content, + CreateDate: task.CreateDate, + UserID: task.UserID, + } +} + +// AddTask implements task.TaskUseCase +func (r *repository) AddTask(task *models.Task) error { + if task == nil { + return errors.New("Invalid input") + } + + if err := r.DB.Create(task).Error; err != nil { + return errors.Wrap(err, "Fail Create Task") + } + + return nil +} + +// FindTaskByUser implements task.TaskUseCase +func (r *repository) FindTaskByUser(userID string, createDate string) ([]models.Task, error) { + if userID == "" || createDate == "" { + return nil, errors.New("Invalid input") + } + + tasks := []models.Task{} + if err := r.DB.Where("user_id = ? and create_date = ?", userID, createDate).Find(&tasks).Error; err != nil { + return nil, errors.Wrap(err, "Fail query task") + } + + if len(tasks) == 0 { + return nil, nil + } + + return tasks, nil +} diff --git a/internal/repositories/task/task_test.go b/internal/repositories/task/task_test.go new file mode 100644 index 000000000..121607afe --- /dev/null +++ b/internal/repositories/task/task_test.go @@ -0,0 +1,139 @@ +package task + +import ( + "fmt" + "regexp" + "testing" + "time" + + "example.com/m/v2/internal/models" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/stretchr/testify/require" +) + +func Test_repository_AddTask(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + + taskRepository := NewTaskRepository(db) + + { //Success case + input := NewTask(models.Task{ + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "manabie", + }) + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + + err := taskRepository.AddTask(input) + require.Nil(t, err) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } + + { //Fail case + input := NewTask(models.Task{ + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "manabie", + }) + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs("", input.Content, input.CreateDate, input.UserID). + WillReturnError(fmt.Errorf("nil task_id")) + mock.ExpectCommit() + + err := taskRepository.AddTask(input) + require.NotNil(t, err) + require.NotNil(t, mock.ExpectationsWereMet()) + } + +} + +func Test_repository_FindTaskByUser(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + + taskRepository := NewTaskRepository(db) + + { //Success case + input := &models.Task{ + Content: "task_manabie_1", + CreateDate: "2022-26-06", + UserID: "manabie_1", + } + // Create mock data for test + mock.ExpectExec("INSERT INTO tasks"). + WithArgs(1, input.Content, input.CreateDate, input.UserID). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStats(db, *input) + require.Nil(t, err) + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, input.UserID) + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + tasks, err := taskRepository.FindTaskByUser(input.UserID, input.CreateDate) + require.Nil(t, err) + require.NotNil(t, tasks) + require.Equal(t, 1, len(tasks)) + require.Equal(t, input.UserID, tasks[0].UserID) + require.Equal(t, input.Content, tasks[0].Content) + require.Equal(t, input.CreateDate, tasks[0].CreateDate) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } + + { //fail case + input := &models.Task{ + Content: "fail_task_manabie_1", + CreateDate: "2022-26-06", + UserID: "fail_manabie_1", + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnError(fmt.Errorf("invalid task")) + + tasks, err := taskRepository.FindTaskByUser(input.UserID, input.CreateDate) + require.NotNil(t, err) + require.Nil(t, tasks) + require.Equal(t, 0, len(tasks)) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } + +} diff --git a/internal/repositories/task/var_test.go b/internal/repositories/task/var_test.go new file mode 100644 index 000000000..4f3d4c99a --- /dev/null +++ b/internal/repositories/task/var_test.go @@ -0,0 +1,37 @@ +package task + +import ( + "fmt" + + "example.com/m/v2/internal/models" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { + sqlDB, mock, err := sqlmock.New() // mock sql.DB + if err != nil { + return nil, nil, errors.Wrap(err, "Fail connection to database") + } + + db, err := gorm.Open("postgres", sqlDB) // open gorm db + if err != nil { + return nil, nil, err + } + + if db == nil { + return nil, nil, errors.New("Fail connection to database") + } + + return db, mock, nil +} + +func recordStats(db *gorm.DB, task models.Task) (err error) { + _, err = db.CommonDB().Exec("INSERT INTO tasks (id, content, create_date, user_id) VALUES (?, ?,?,?,?)", 1, task.Content, task.CreateDate, task.UserID) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) + } + return +} From f719e238abb5e0bc35e7b4333794ce86ec953e42 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:44:15 +0700 Subject: [PATCH 08/61] Add AuthUseCase and AuthRepository --- internal/repositories/auth/CHANGELOG.md | 3 +- internal/repositories/auth/auth.go | 71 +++++++++++++ internal/repositories/auth/auth_test.go | 126 ++++++++++++++++++++++++ internal/repositories/auth/var_test.go | 35 +++++++ internal/usecases/auth/CHANGELOG.md | 2 + internal/usecases/auth/auth.go | 25 +++++ internal/usecases/auth/interface.go | 9 ++ 7 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 internal/repositories/auth/auth_test.go create mode 100644 internal/repositories/auth/var_test.go diff --git a/internal/repositories/auth/CHANGELOG.md b/internal/repositories/auth/CHANGELOG.md index 07ddfde6d..fddbb65d0 100644 --- a/internal/repositories/auth/CHANGELOG.md +++ b/internal/repositories/auth/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Create file `task.go` +- Create unit test case +- Make setup mock diff --git a/internal/repositories/auth/auth.go b/internal/repositories/auth/auth.go index 8832b06d1..4ff69fd2d 100644 --- a/internal/repositories/auth/auth.go +++ b/internal/repositories/auth/auth.go @@ -1 +1,72 @@ package auth + +import ( + "os" + "strconv" + "time" + + "example.com/m/v2/internal/models" + "example.com/m/v2/internal/usecases/auth" + "example.com/m/v2/utils" + + "github.com/dgrijalva/jwt-go" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +type repository struct { + DB *gorm.DB +} + +func NewAuthRepository(db *gorm.DB) auth.AuthRepository { + return &repository{ + DB: db, + } +} + +// ValidateUser implements auth.AuthRepository +func (r *repository) ValidateUser(username string) (bool, error) { + if username == "" { + return false, errors.New("Invalid input") + } + + user := &models.User{} + if err := r.DB.Where("username = ?", username).First(user).Error; err != nil { + return false, err + } + + if user != nil && user.Username != "" { + return true, nil + } + + return true, nil +} + +func (r *repository) GenerateToken(userID, maxTaskPerday string) (*string, error) { + if userID == "" { + return nil, errors.New("Input empty") + } + + // Init a map claim for storing essential info + claims := jwt.MapClaims{} + + timeout, err := strconv.Atoi(os.Getenv("JWT_TIMEOUT")) + if err != nil { + return nil, err + } + + //Set value for token + claims["user_id"] = userID + claims["max_task_per_day"] = maxTaskPerday + + // Must use 'exp' key for storing timeout info + claims["exp"] = time.Now().Add(time.Minute * time.Duration(timeout)).Unix() + + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenString, err := token.SignedString([]byte(os.Getenv("JWT_KEY"))) + if err != nil { + return nil, err + } + + return utils.String(tokenString), nil +} diff --git a/internal/repositories/auth/auth_test.go b/internal/repositories/auth/auth_test.go new file mode 100644 index 000000000..2de50da3f --- /dev/null +++ b/internal/repositories/auth/auth_test.go @@ -0,0 +1,126 @@ +package auth + +import ( + "fmt" + "regexp" + "testing" + + "example.com/m/v2/utils" + "github.com/DATA-DOG/go-sqlmock" + "github.com/stretchr/testify/require" +) + +func Test_repository_ValidateUser(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + + type userValidate struct { + Username string + Password string + Expect bool + } + + authRepository := NewAuthRepository(db) + + { //Success case + user := userValidate{ + Username: "manabie321", + Password: "123456", + Expect: true, + } + + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStats(db, user.Username, user.Password) + require.Nil(t, err) + + rows := sqlmock.NewRows([]string{"id", "username", "password", "max_task_per_day"}). + AddRow("1", user.Username, user.Password, 5) + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(user.Username). + WillReturnRows(rows) + + actual, err := authRepository.ValidateUser(user.Username) + require.Nil(t, err) + require.Equal(t, user.Expect, actual) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } + { // Fail case + user := userValidate{ + Username: "fail_name", + Password: "fail_pass", + Expect: false, + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(user.Username). + WillReturnError(fmt.Errorf("invalid user")) + + actual, err := authRepository.ValidateUser(user.Username) + require.NotNil(t, err) + require.Equal(t, user.Expect, actual) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + } +} + +func Test_repository_GenerateToken(t *testing.T) { + t.Parallel() + //Load Env + utils.LoadEnv("../../../.env") + + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + type args struct { + userID string + maxTaskPerday string + } + + authRepository := NewAuthRepository(db) + { // Success case + input := args{ + userID: "1", + maxTaskPerday: "5", + } + tokenStr, err := authRepository.GenerateToken(input.userID, input.maxTaskPerday) + require.Nil(t, err) + require.NotNil(t, tokenStr) + + require.NotEqual(t, "", utils.SafeString(tokenStr)) + } + + { // Fail case + input := args{ + userID: "", + maxTaskPerday: "", + } + tokenStr, err := authRepository.GenerateToken(input.userID, input.maxTaskPerday) + require.NotNil(t, err) + require.Nil(t, tokenStr) + + require.Equal(t, "", utils.SafeString(tokenStr)) + } +} diff --git a/internal/repositories/auth/var_test.go b/internal/repositories/auth/var_test.go new file mode 100644 index 000000000..a6c1210cb --- /dev/null +++ b/internal/repositories/auth/var_test.go @@ -0,0 +1,35 @@ +package auth + +import ( + "fmt" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { + sqlDB, mock, err := sqlmock.New() // mock sql.DB + if err != nil { + return nil, nil, errors.Wrap(err, "Fail connection to database") + } + + db, err := gorm.Open("postgres", sqlDB) // open gorm db + if err != nil { + return nil, nil, err + } + + if db == nil { + return nil, nil, errors.New("Fail connection to database") + } + + return db, mock, nil +} + +func recordStats(db *gorm.DB, username, password string) (err error) { + _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) + } + return +} diff --git a/internal/usecases/auth/CHANGELOG.md b/internal/usecases/auth/CHANGELOG.md index f53c5746c..24b97e46d 100644 --- a/internal/usecases/auth/CHANGELOG.md +++ b/internal/usecases/auth/CHANGELOG.md @@ -7,4 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create func for `authUseCase` +- Implement `AuthUseCase` - Create file `interface.go` and `auth.go` diff --git a/internal/usecases/auth/auth.go b/internal/usecases/auth/auth.go index 8832b06d1..cfe716f40 100644 --- a/internal/usecases/auth/auth.go +++ b/internal/usecases/auth/auth.go @@ -1 +1,26 @@ package auth + +// AuthUsecase is the definition for collection of methods related to the `auths` table use case +type AuthUseCase interface { + ValidateUser(username string) (bool, error) + GenerateToken(userID, maxTaskPerday string) (*string, error) +} + +type authUseCaseRepository struct { + repository AuthRepository +} + +// NewAuthUsecase returns a AuthUsecase attached with methods related to the `auths` table use case +func NewAuthUseCase(repository AuthRepository) AuthUseCase { + return &authUseCaseRepository{repository: repository} +} + +// ValidateUser returns a AuthUsecase attached with methods related to the `auths` table use case +func (ar *authUseCaseRepository) ValidateUser(username string) (bool, error) { + return ar.repository.ValidateUser(username) +} + +// GenerateToken returns a AuthUsecase attached with methods related to the `auths` table use case +func (ar *authUseCaseRepository) GenerateToken(userID, maxTaskPerday string) (*string, error) { + return ar.repository.GenerateToken(userID, maxTaskPerday) +} diff --git a/internal/usecases/auth/interface.go b/internal/usecases/auth/interface.go index 8832b06d1..b00c53a3c 100644 --- a/internal/usecases/auth/interface.go +++ b/internal/usecases/auth/interface.go @@ -1 +1,10 @@ package auth + +type Common interface { + ValidateUser(username string) (bool, error) + GenerateToken(userID, maxTaskPerday string) (*string, error) +} + +type AuthRepository interface { + Common +} From 9156ce6dd6be44b353b531cad85527314e40d209 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:51:00 +0700 Subject: [PATCH 09/61] Handle func on api and create router --- go.mod | 1 + go.sum | 2 + internal/api/CHANGELOG.md | 10 ++ internal/api/handlers/CHANGELOG.md | 11 +++ internal/api/handlers/common/CHANGELOG.md | 11 +++ internal/api/handlers/common/api.go | 14 +++ internal/api/handlers/common/common.go | 58 ++++++++++++ internal/api/handlers/handlers.go | 110 ++++++++++++++++++++++ internal/api/handlers/handlers_test.go | 34 +++++++ internal/api/handlers/task/CHANGELOG.md | 11 +++ internal/api/handlers/task/api.go | 14 +++ internal/api/handlers/task/task.go | 69 ++++++++++++++ internal/api/handlers/task/task_test.go | 29 ++++++ internal/api/handlers/user/CHANGELOG.md | 11 +++ internal/api/handlers/user/api.go | 14 +++ internal/api/handlers/user/user.go | 52 ++++++++++ internal/api/handlers/user/user_test.go | 10 ++ internal/api/handlers/user/var_test.go | 33 +++++++ internal/api/routes/CHANGELOG.md | 10 ++ internal/api/routes/routes.go | 16 ++++ internal/api/routes/routes_test.go | 26 +++++ internal/pkg/CHANGELOG.md | 1 + internal/pkg/responses/CHANGELOG.md | 10 ++ internal/pkg/responses/responses.go | 38 ++++++++ internal/repositories/auth/CHANGELOG.md | 1 + 25 files changed, 596 insertions(+) create mode 100644 internal/api/CHANGELOG.md create mode 100644 internal/api/handlers/CHANGELOG.md create mode 100644 internal/api/handlers/common/CHANGELOG.md create mode 100644 internal/api/handlers/common/api.go create mode 100644 internal/api/handlers/common/common.go create mode 100644 internal/api/handlers/handlers.go create mode 100644 internal/api/handlers/handlers_test.go create mode 100644 internal/api/handlers/task/CHANGELOG.md create mode 100644 internal/api/handlers/task/api.go create mode 100644 internal/api/handlers/task/task.go create mode 100644 internal/api/handlers/task/task_test.go create mode 100644 internal/api/handlers/user/CHANGELOG.md create mode 100644 internal/api/handlers/user/api.go create mode 100644 internal/api/handlers/user/user.go create mode 100644 internal/api/handlers/user/user_test.go create mode 100644 internal/api/handlers/user/var_test.go create mode 100644 internal/api/routes/CHANGELOG.md create mode 100644 internal/api/routes/routes.go create mode 100644 internal/api/routes/routes_test.go create mode 100644 internal/pkg/responses/CHANGELOG.md create mode 100644 internal/pkg/responses/responses.go diff --git a/go.mod b/go.mod index 276cf36a2..21f7d9306 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect github.com/caarlos0/env v3.5.0+incompatible // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.8.1 // indirect github.com/go-playground/locales v0.14.0 // indirect diff --git a/go.sum b/go.sum index 81842dd8a..7a21a0dcb 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= diff --git a/internal/api/CHANGELOG.md b/internal/api/CHANGELOG.md new file mode 100644 index 000000000..154dfb78d --- /dev/null +++ b/internal/api/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `handlers` and `routes` diff --git a/internal/api/handlers/CHANGELOG.md b/internal/api/handlers/CHANGELOG.md new file mode 100644 index 000000000..c248b9996 --- /dev/null +++ b/internal/api/handlers/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Get token from cookie +- Make handle `UseCase` diff --git a/internal/api/handlers/common/CHANGELOG.md b/internal/api/handlers/common/CHANGELOG.md new file mode 100644 index 000000000..ab4fa67d3 --- /dev/null +++ b/internal/api/handlers/common/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `router` +- Handle func common diff --git a/internal/api/handlers/common/api.go b/internal/api/handlers/common/api.go new file mode 100644 index 000000000..7edd13a16 --- /dev/null +++ b/internal/api/handlers/common/api.go @@ -0,0 +1,14 @@ +package common + +import ( + "example.com/m/v2/internal/api/handlers" + + "github.com/gin-gonic/gin" +) + +func NewHandler(router *gin.Engine, service handlers.MainUseCase) { + apiUser := router.Group("/") + { + apiUser.POST("/login", Login(service)) + } +} diff --git a/internal/api/handlers/common/common.go b/internal/api/handlers/common/common.go new file mode 100644 index 000000000..00bcee8fd --- /dev/null +++ b/internal/api/handlers/common/common.go @@ -0,0 +1,58 @@ +package common + +import ( + "fmt" + "net/http" + "strconv" + + "example.com/m/v2/constants" + "example.com/m/v2/internal/api/handlers" + "example.com/m/v2/internal/pkg/responses" + "example.com/m/v2/utils" + + "github.com/gin-gonic/gin" +) + +type Input struct { + Username string `json:"username"` + Password string `json:"password"` +} + +func Login(service handlers.MainUseCase) gin.HandlerFunc { + return func(ctx *gin.Context) { + var inputUser Input + if err := ctx.ShouldBindJSON(&inputUser); err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail BindJSON user") + return + } + + user, err := service.User.Login(inputUser.Username, inputUser.Password) + if err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail Login") + return + } + + if user == nil { + responses.ResponseForError(ctx, nil, http.StatusBadRequest, "Fail Login") + return + } + + maxTaskPerDay := strconv.Itoa(user.MaxTaskPerDay) + + token, err := service.Auth.GenerateToken(user.ID, maxTaskPerDay) + if err != nil { + responses.ResponseForError(ctx, err, http.StatusInternalServerError, "Fail GenerateToken") + return + } + + if utils.SafeString(token) == "" { + responses.ResponseForError(ctx, nil, http.StatusInternalServerError, "Fail GenerateToken") + return + } + + //Set Cookie + ctx.SetCookie(constants.CookieTokenKey, utils.SafeString(token), 60*60*24, "/", fmt.Sprintf("%s:%s", utils.Env.DBHost, utils.Env.DBPort), true, true) + + responses.ResponseForOK(ctx, http.StatusOK, nil, "Success") + } +} diff --git a/internal/api/handlers/handlers.go b/internal/api/handlers/handlers.go new file mode 100644 index 000000000..8d30efd45 --- /dev/null +++ b/internal/api/handlers/handlers.go @@ -0,0 +1,110 @@ +package handlers + +import ( + "fmt" + + "example.com/m/v2/constants" + authRepo "example.com/m/v2/internal/repositories/auth" + taskRepo "example.com/m/v2/internal/repositories/task" + userRepo "example.com/m/v2/internal/repositories/user" + "example.com/m/v2/utils" + + authService "example.com/m/v2/internal/usecases/auth" + taskService "example.com/m/v2/internal/usecases/task" + userService "example.com/m/v2/internal/usecases/user" + + "github.com/dgrijalva/jwt-go" + "github.com/gin-gonic/gin" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +type MainUseCase struct { + Auth authService.AuthUseCase + User userService.UserUseCase + Task taskService.TaskUseCase +} + +var MainUC = &MainUseCase{} + +func SetMainUseCase(muc *MainUseCase) { + MainUC = muc +} + +func NewUseCase(db *gorm.DB) MainUseCase { + // Create repositories. + authRepository := authRepo.NewAuthRepository(db) + userRepository := userRepo.NewUserRepository(db) + taskRepository := taskRepo.NewTaskRepository(db) + + //Create UseCase + authUseCase := authService.NewAuthUseCase(authRepository) + userUseCase := userService.NewUserUseCase(userRepository) + taskUseCase := taskService.NewTaskUseCase(taskRepository) + + return MainUseCase{ + Auth: authUseCase, + User: userUseCase, + Task: taskUseCase, + } +} + +type UserInfoFromCtx string +type UserInfoFromToken struct { + ID string + MaxTaskPerDay string +} + +func GetValueCookieFromCtx(ctx *gin.Context, keyCookie string) (*string, error) { + cookie, err := ctx.Request.Cookie(keyCookie) + if err != nil { + return nil, errors.Wrap(err, fmt.Sprintf("Don't have cookie with Key: %s", keyCookie)) + } + + if cookie == nil { + return nil, errors.New("Cookie is nil") + } + + return utils.String(cookie.Value), nil +} + +func GetUserInfoFromToken(ctx *gin.Context) (*UserInfoFromToken, error) { + tokenStr, err := GetValueCookieFromCtx(ctx, constants.CookieTokenKey) + if err != nil { + return nil, errors.Wrap(err, fmt.Sprintf("Don't have cookie with Key1: %s", constants.CookieTokenKey)) + } + + if utils.SafeString(tokenStr) == "" { + return nil, errors.New(fmt.Sprintf("Don't have cookie with Key2: %s", constants.CookieTokenKey)) + } + + claims := make(jwt.MapClaims) + tkn, err := jwt.ParseWithClaims(utils.SafeString(tokenStr), claims, func(token *jwt.Token) (interface{}, error) { + return []byte(utils.Env.JwtKey), nil + }) + + if err != nil { + return nil, errors.New(fmt.Sprintf("Don't have cookie with Key3: %s", constants.CookieTokenKey)) + } + + if tkn == nil || !tkn.Valid { + return nil, errors.New(fmt.Sprintf("Don't have cookie with Key4: %s", constants.CookieTokenKey)) + } + + id, ok := claims["user_id"].(string) + if !ok { + return nil, errors.New(fmt.Sprintf("Don't have cookie with Key5: %s", constants.CookieTokenKey)) + } + + maxTaskPerDay, ok := claims["max_task_per_day"].(string) + if !ok { + return nil, errors.New(fmt.Sprintf("Don't have cookie with Key6: %s", constants.CookieTokenKey)) + } + + userInfo := &UserInfoFromToken{ + ID: id, + MaxTaskPerDay: maxTaskPerDay, + } + + return userInfo, nil +} diff --git a/internal/api/handlers/handlers_test.go b/internal/api/handlers/handlers_test.go new file mode 100644 index 000000000..d422a8836 --- /dev/null +++ b/internal/api/handlers/handlers_test.go @@ -0,0 +1,34 @@ +package handlers + +import ( + "testing" + + "github.com/gin-gonic/gin" +) + +func TestGetValueCookieFromCtx(t *testing.T) { + type args struct { + ctx *gin.Context + keyCookie string + } + tests := []struct { + name string + args args + want *string + wantErr bool + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := GetValueCookieFromCtx(tt.args.ctx, tt.args.keyCookie) + if (err != nil) != tt.wantErr { + t.Errorf("GetValueCookieFromCtx() error = %v, wantErr %v", err, tt.wantErr) + return + } + if got != tt.want { + t.Errorf("GetValueCookieFromCtx() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/internal/api/handlers/task/CHANGELOG.md b/internal/api/handlers/task/CHANGELOG.md new file mode 100644 index 000000000..5959dbcae --- /dev/null +++ b/internal/api/handlers/task/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `router` +- Handle func `Validate` and api `FindTaskByUser` diff --git a/internal/api/handlers/task/api.go b/internal/api/handlers/task/api.go new file mode 100644 index 000000000..09277e388 --- /dev/null +++ b/internal/api/handlers/task/api.go @@ -0,0 +1,14 @@ +package task + +import ( + "example.com/m/v2/internal/api/handlers" + + "github.com/gin-gonic/gin" +) + +func NewHandler(router *gin.Engine, service handlers.MainUseCase) { + apiTask := router.Group("/tasks") + { + apiTask.POST("/", AddTask(service)) + } +} diff --git a/internal/api/handlers/task/task.go b/internal/api/handlers/task/task.go new file mode 100644 index 000000000..ab498d801 --- /dev/null +++ b/internal/api/handlers/task/task.go @@ -0,0 +1,69 @@ +package task + +import ( + "net/http" + "strconv" + "time" + + "example.com/m/v2/internal/api/handlers" + "example.com/m/v2/internal/models" + "example.com/m/v2/internal/pkg/responses" + "example.com/m/v2/internal/repositories/task" + + "github.com/gin-gonic/gin" +) + +func AddTask(service handlers.MainUseCase) gin.HandlerFunc { + return func(ctx *gin.Context) { + userInfo, err := handlers.GetUserInfoFromToken(ctx) + if err != nil { + responses.ResponseForError(ctx, err, http.StatusUnauthorized, "Access denied") + return + } + + // Get task per day of user + maxTaskOfUser, err := strconv.Atoi(userInfo.MaxTaskPerDay) + if err != nil { + responses.ResponseForError(ctx, err, http.StatusInternalServerError, "Fail Parse String to Int") + return + } + createDate := time.Now().Format("2006-01-02") + + // Find all tasks of user with userID and createDate + tasks, err := service.Task.FindTaskByUser(userInfo.ID, createDate) + if err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail FindTaskByUser") + return + } + + // Check number of task + if IsMaxTaskPerDay(len(tasks), maxTaskOfUser) { + responses.ResponseForError(ctx, nil, http.StatusInternalServerError, "Number tasks of User is maximum") + return + } + + // Mapping Request + input := models.Task{} + if err := ctx.ShouldBindJSON(&input); err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail BindJSON user") + return + } + input.UserID = userInfo.ID + input.CreateDate = createDate + + // New + out := task.NewTask(input) + + // Create Task + if err := service.Task.AddTask(out); err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail Add Task") + return + } + + responses.ResponseForOK(ctx, http.StatusOK, nil, "Success") + } +} + +func IsMaxTaskPerDay(numTaskPerDay int, maxTaskOfUser int) bool { + return numTaskPerDay >= maxTaskOfUser +} diff --git a/internal/api/handlers/task/task_test.go b/internal/api/handlers/task/task_test.go new file mode 100644 index 000000000..58df70370 --- /dev/null +++ b/internal/api/handlers/task/task_test.go @@ -0,0 +1,29 @@ +package task + +import ( + "reflect" + "testing" + + "example.com/m/v2/internal/api/handlers" + "github.com/gin-gonic/gin" +) + +func TestAddTask(t *testing.T) { + type args struct { + service handlers.MainUseCase + } + tests := []struct { + name string + args args + want gin.HandlerFunc + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := AddTask(tt.args.service); !reflect.DeepEqual(got, tt.want) { + t.Errorf("AddTask() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/internal/api/handlers/user/CHANGELOG.md b/internal/api/handlers/user/CHANGELOG.md new file mode 100644 index 000000000..fd7791f0b --- /dev/null +++ b/internal/api/handlers/user/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `router` +- Handle api `Create` diff --git a/internal/api/handlers/user/api.go b/internal/api/handlers/user/api.go new file mode 100644 index 000000000..445abeedd --- /dev/null +++ b/internal/api/handlers/user/api.go @@ -0,0 +1,14 @@ +package user + +import ( + "example.com/m/v2/internal/api/handlers" + + "github.com/gin-gonic/gin" +) + +func NewHandler(router *gin.Engine, service handlers.MainUseCase) { + apiUser := router.Group("/users") + { + apiUser.POST("/", CreateUser(service)) + } +} diff --git a/internal/api/handlers/user/user.go b/internal/api/handlers/user/user.go new file mode 100644 index 000000000..eebcb87c1 --- /dev/null +++ b/internal/api/handlers/user/user.go @@ -0,0 +1,52 @@ +package user + +import ( + "net/http" + + "example.com/m/v2/internal/api/handlers" + "example.com/m/v2/internal/models" + "example.com/m/v2/internal/pkg/responses" + "example.com/m/v2/internal/repositories/user" + + "github.com/gin-gonic/gin" +) + +type Input struct { + Username string `json:"username" validate:"required"` + Password string `json:"password" validate:"required"` + MaxTaskPerDay int `json:"max_task_per_day,omitempty"` +} + +func CreateUser(service handlers.MainUseCase) gin.HandlerFunc { + return func(ctx *gin.Context) { + var inputUser Input + if err := ctx.Bind(&inputUser); err != nil { + responses.ResponseForError(ctx, err, http.StatusInternalServerError, "Fail BindJSON user") + return + } + + isExistUser, err := service.Auth.ValidateUser(inputUser.Username) + if err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail ValidateUser") + return + } + + if isExistUser { + responses.ResponseForError(ctx, nil, http.StatusForbidden, "User is exists") + return + } + + input := user.New(&models.User{ + Username: inputUser.Username, + Password: inputUser.Password, + MaxTaskPerDay: inputUser.MaxTaskPerDay, + }) + + if err := service.User.Create(input); err != nil { + responses.ResponseForError(ctx, nil, http.StatusInternalServerError, "Fail CreateUser") + return + } + + responses.ResponseForOK(ctx, http.StatusOK, inputUser, "Success") + } +} diff --git a/internal/api/handlers/user/user_test.go b/internal/api/handlers/user/user_test.go new file mode 100644 index 000000000..cea8b9a8c --- /dev/null +++ b/internal/api/handlers/user/user_test.go @@ -0,0 +1,10 @@ +package user + +import ( + "testing" +) + +func TestCreateUser(t *testing.T) { + t.Parallel() + +} diff --git a/internal/api/handlers/user/var_test.go b/internal/api/handlers/user/var_test.go new file mode 100644 index 000000000..1e42db66c --- /dev/null +++ b/internal/api/handlers/user/var_test.go @@ -0,0 +1,33 @@ +package user + +import ( + "github.com/DATA-DOG/go-sqlmock" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { + sqlDB, mock, err := sqlmock.New() // mock sql.DB + if err != nil { + return nil, nil, errors.Wrap(err, "Fail connection to database") + } + + db, err := gorm.Open("postgres", sqlDB) // open gorm db + if err != nil { + return nil, nil, err + } + + if db == nil { + return nil, nil, errors.New("Fail connection to database") + } + + return db, mock, nil +} + +// func recordStats(db *gorm.DB, username, password string) (err error) { +// _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) +// if err != nil { +// return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) +// } +// return +// } diff --git a/internal/api/routes/CHANGELOG.md b/internal/api/routes/CHANGELOG.md new file mode 100644 index 000000000..3a2d20f05 --- /dev/null +++ b/internal/api/routes/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create handle router diff --git a/internal/api/routes/routes.go b/internal/api/routes/routes.go new file mode 100644 index 000000000..880f7b7ed --- /dev/null +++ b/internal/api/routes/routes.go @@ -0,0 +1,16 @@ +package routes + +import ( + "example.com/m/v2/internal/api/handlers" + "example.com/m/v2/internal/api/handlers/common" + "example.com/m/v2/internal/api/handlers/task" + "example.com/m/v2/internal/api/handlers/user" + + "github.com/gin-gonic/gin" +) + +func SetupRoute(router *gin.Engine, service handlers.MainUseCase) { + common.NewHandler(router, service) + user.NewHandler(router, service) + task.NewHandler(router, service) +} diff --git a/internal/api/routes/routes_test.go b/internal/api/routes/routes_test.go new file mode 100644 index 000000000..b64d53bb2 --- /dev/null +++ b/internal/api/routes/routes_test.go @@ -0,0 +1,26 @@ +package routes + +import ( + "testing" + + "example.com/m/v2/internal/api/handlers" + "github.com/gin-gonic/gin" +) + +func TestSetupRoute(t *testing.T) { + type args struct { + router *gin.Engine + service handlers.MainUseCase + } + tests := []struct { + name string + args args + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + SetupRoute(tt.args.router, tt.args.service) + }) + } +} diff --git a/internal/pkg/CHANGELOG.md b/internal/pkg/CHANGELOG.md index 2019d150f..6cf3fc59d 100644 --- a/internal/pkg/CHANGELOG.md +++ b/internal/pkg/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create respoonse - Make create `uuid` diff --git a/internal/pkg/responses/CHANGELOG.md b/internal/pkg/responses/CHANGELOG.md new file mode 100644 index 000000000..b5a204b7a --- /dev/null +++ b/internal/pkg/responses/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create struct for response Ok and errors diff --git a/internal/pkg/responses/responses.go b/internal/pkg/responses/responses.go new file mode 100644 index 000000000..5416c57f3 --- /dev/null +++ b/internal/pkg/responses/responses.go @@ -0,0 +1,38 @@ +package responses + +import ( + "example.com/m/v2/constants" + + "github.com/gin-gonic/gin" +) + +type ResponseError struct { + Status int + Error error + ErrorDetail string +} + +type ResponseOK struct { + Status int + Data interface{} +} + +func ResponseForError(ctx *gin.Context, err error, status int, errorDetail string) { + e := "" + if err != nil { + e = err.Error() + } + ctx.JSON(status, gin.H{ + constants.ResponseStatus: status, + constants.ResponseError: e, + constants.ResponseErrorDetail: errorDetail, + }) +} + +func ResponseForOK(ctx *gin.Context, status int, data interface{}, message string) { + ctx.JSON(status, gin.H{ + constants.ResponseStatus: status, + constants.ResponseData: data, + constants.ResponseMessage: message, + }) +} diff --git a/internal/repositories/auth/CHANGELOG.md b/internal/repositories/auth/CHANGELOG.md index fddbb65d0..58f1c455d 100644 --- a/internal/repositories/auth/CHANGELOG.md +++ b/internal/repositories/auth/CHANGELOG.md @@ -8,4 +8,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Create unit test case +- Generate token - Make setup mock From 78eb23b2830d95a8d5a01d79135eed64a607ed9b Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:53:50 +0700 Subject: [PATCH 10/61] Create middlewares --- cmd/CHANGELOG.md | 1 + cmd/middlewares/CHANGELOG.md | 11 ++++++++ cmd/middlewares/middlewares.go | 34 ++++++++++++++++++++++++ cmd/middlewares/middlewares_test.go | 40 +++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 cmd/middlewares/CHANGELOG.md create mode 100644 cmd/middlewares/middlewares.go create mode 100644 cmd/middlewares/middlewares_test.go diff --git a/cmd/CHANGELOG.md b/cmd/CHANGELOG.md index 09c172e50..4884c5fff 100644 --- a/cmd/CHANGELOG.md +++ b/cmd/CHANGELOG.md @@ -7,5 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create folder `middlewares` - Create connection to database postgres - Create `main` diff --git a/cmd/middlewares/CHANGELOG.md b/cmd/middlewares/CHANGELOG.md new file mode 100644 index 000000000..34278c027 --- /dev/null +++ b/cmd/middlewares/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `SetDefaultMiddleWare` and `ValidateToken` from Cookie + diff --git a/cmd/middlewares/middlewares.go b/cmd/middlewares/middlewares.go new file mode 100644 index 000000000..4c1919e47 --- /dev/null +++ b/cmd/middlewares/middlewares.go @@ -0,0 +1,34 @@ +package middlewares + +import ( + "log" + + "example.com/m/v2/constants" + "example.com/m/v2/internal/api/handlers" + "example.com/m/v2/utils" + + "github.com/gin-gonic/gin" +) + +func SetDefaultMiddleWare() gin.HandlerFunc { + return func(ctx *gin.Context) { + ctx.Header("Access-Control-Allow-Origin", "*") + ctx.Header("Access-Control-Allow-Headers", "*") + ctx.Header("Access-Control-Allow-Methods", "*") + + ctx.Header("Content-Type", "application/json") + } +} + +func ValidateToken() gin.HandlerFunc { + return func(ctx *gin.Context) { + value, err := handlers.GetValueCookieFromCtx(ctx, constants.CookieTokenKey) + if err != nil { + log.Fatalf("Fail GetTokenKeyFromCtx") + } + + if utils.SafeString(value) == "" { + log.Fatalf("Please login") + } + } +} diff --git a/cmd/middlewares/middlewares_test.go b/cmd/middlewares/middlewares_test.go new file mode 100644 index 000000000..b2d555295 --- /dev/null +++ b/cmd/middlewares/middlewares_test.go @@ -0,0 +1,40 @@ +package middlewares + +import ( + "reflect" + "testing" + + "github.com/gin-gonic/gin" +) + +func TestSetDefaultMiddleWare(t *testing.T) { + tests := []struct { + name string + want gin.HandlerFunc + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := SetDefaultMiddleWare(); !reflect.DeepEqual(got, tt.want) { + t.Errorf("SetDefaultMiddleWare() = %v, want %v", got, tt.want) + } + }) + } +} + +func TestValidateToken(t *testing.T) { + tests := []struct { + name string + want gin.HandlerFunc + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := ValidateToken(); !reflect.DeepEqual(got, tt.want) { + t.Errorf("ValidateToken() = %v, want %v", got, tt.want) + } + }) + } +} From 411ab09910d0325d0d4ce1e140ee9f256e513832 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 14:54:17 +0700 Subject: [PATCH 11/61] Set middleware and set repository --- cmd/main.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cmd/main.go b/cmd/main.go index a388cd4b8..e187860ca 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,7 +4,10 @@ import ( "fmt" "log" + "example.com/m/v2/cmd/middlewares" "example.com/m/v2/constants" + "example.com/m/v2/internal/api/handlers" + "example.com/m/v2/internal/api/routes" "example.com/m/v2/internal/driver" "example.com/m/v2/utils" @@ -29,6 +32,22 @@ func run() error { c.Set("db", db) }) + { // Set Middlewares + // Midlewares + r.Use(gin.Logger()) + // Recovery middleware recovers from any panics and writes a 500 if there was one. + r.Use(gin.Recovery()) + r.Use(middlewares.SetDefaultMiddleWare()) + r.Use(middlewares.ValidateToken()) + } + + { //Set Repository + usecases := handlers.NewUseCase(db) + handlers.SetMainUseCase(&usecases) + //Set Route + routes.SetupRoute(r, usecases) + } + log.Fatal(r.Run(fmt.Sprintf(":%s", utils.Env.Port))) return nil } From 3739ae3ce1289c0e4fa89e6324af5ed9635b0069 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 16:15:52 +0700 Subject: [PATCH 12/61] Create migration data and makefile --- CHANGELOG.md | 1 + Makefile | 20 ++++++++++++++++++++ db/migrations/1_user.down.sql | 7 +++++++ db/migrations/1_user.up.sql | 11 +++++++++++ db/migrations/2_task.down.sql | 8 ++++++++ db/migrations/2_task.up.sql | 12 ++++++++++++ db/migrations/3_alter_user.down.sql | 0 db/migrations/3_alter_user.up.sql | 5 +++++ db/migrations/4_alter_task.down.sql | 0 db/migrations/4_alter_task.up.sql | 5 +++++ db/migrations/CHANGELOG.md | 12 ++++++++++++ 11 files changed, 81 insertions(+) create mode 100644 db/migrations/1_user.down.sql create mode 100644 db/migrations/1_user.up.sql create mode 100644 db/migrations/2_task.down.sql create mode 100644 db/migrations/2_task.up.sql create mode 100644 db/migrations/3_alter_user.down.sql create mode 100644 db/migrations/3_alter_user.up.sql create mode 100644 db/migrations/4_alter_task.down.sql create mode 100644 db/migrations/4_alter_task.up.sql create mode 100644 db/migrations/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index d7c6928fa..5519f9510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,4 +7,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create terminal in `Makefile` - Initial and structure for project diff --git a/Makefile b/Makefile index e69de29bb..c89424528 100644 --- a/Makefile +++ b/Makefile @@ -0,0 +1,20 @@ +#!make +### Export file .env +include .env +export + +### Migration +migration-up: + @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up + @migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up + +migration-down: + @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down + @migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down + +test-migration: + @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down + @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up + +nodemon: + nodemon --exec go run cmd/main.go --signal SIGTERM diff --git a/db/migrations/1_user.down.sql b/db/migrations/1_user.down.sql new file mode 100644 index 000000000..718c9dd79 --- /dev/null +++ b/db/migrations/1_user.down.sql @@ -0,0 +1,7 @@ +BEGIN; + +ALTER TABLE "public"."users" DROP CONSTRAINT user_PK; + +DROP TABLE IF EXISTS "public"."users"; + +COMMIT; diff --git a/db/migrations/1_user.up.sql b/db/migrations/1_user.up.sql new file mode 100644 index 000000000..24f3dbe1e --- /dev/null +++ b/db/migrations/1_user.up.sql @@ -0,0 +1,11 @@ +BEGIN; + +CREATE TABLE IF NOT EXISTS users ( + id varchar(50) NOT NULL, + username varchar(50) NOT NULL, + password varchar(50) NOT NULL, + max_task_per_day INTEGER DEFAULT 5 NOT NULL, + CONSTRAINT user_PK PRIMARY KEY (id) +); + +COMMIT; diff --git a/db/migrations/2_task.down.sql b/db/migrations/2_task.down.sql new file mode 100644 index 000000000..95bb6eb0c --- /dev/null +++ b/db/migrations/2_task.down.sql @@ -0,0 +1,8 @@ +BEGIN; + +ALTER TABLE "public"."tasks" DROP CONSTRAINT task_FK; +ALTER TABLE "public"."tasks" DROP CONSTRAINT task_PK; + +DROP TABLE IF EXISTS "public"."tasks"; + +COMMIT; diff --git a/db/migrations/2_task.up.sql b/db/migrations/2_task.up.sql new file mode 100644 index 000000000..dd0ff9061 --- /dev/null +++ b/db/migrations/2_task.up.sql @@ -0,0 +1,12 @@ +BEGIN; + +CREATE TABLE IF NOT EXISTS tasks( + id varchar(50) NOT NULL, + content varchar(50) NOT NULL, + create_date varchar(50) NOT NULL, + user_id varchar(50) NOT NULL, + CONSTRAINT task_PK PRIMARY KEY (id), + CONSTRAINT task_FK FOREIGN KEY (user_id) REFERENCES users(id) +); + +COMMIT; diff --git a/db/migrations/3_alter_user.down.sql b/db/migrations/3_alter_user.down.sql new file mode 100644 index 000000000..e69de29bb diff --git a/db/migrations/3_alter_user.up.sql b/db/migrations/3_alter_user.up.sql new file mode 100644 index 000000000..b46914fdb --- /dev/null +++ b/db/migrations/3_alter_user.up.sql @@ -0,0 +1,5 @@ +BEGIN; + +INSERT INTO "public"."users" (id, username, password, max_task_per_day) VALUES('firstUser','manabie' ,'example', 5); + +COMMIT; diff --git a/db/migrations/4_alter_task.down.sql b/db/migrations/4_alter_task.down.sql new file mode 100644 index 000000000..e69de29bb diff --git a/db/migrations/4_alter_task.up.sql b/db/migrations/4_alter_task.up.sql new file mode 100644 index 000000000..3cee771e9 --- /dev/null +++ b/db/migrations/4_alter_task.up.sql @@ -0,0 +1,5 @@ +BEGIN; + +INSERT INTO "public"."tasks" ("id", "content", "create_date", "user_id") VALUES ('1', 'manabie', '2022-06-22', 'firstUser'); + +COMMIT; diff --git a/db/migrations/CHANGELOG.md b/db/migrations/CHANGELOG.md new file mode 100644 index 000000000..a5c088d89 --- /dev/null +++ b/db/migrations/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Added migration data for `tasks` +- Added migration data for `users` +- Added migration table `users` and `tasks` From 73ff15edd9c47952c319750ce49554f92aa1d5d5 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 19:29:29 +0700 Subject: [PATCH 13/61] Change name module --- .env | 7 +- cmd/main.go | 14 +- cmd/middlewares/middlewares.go | 6 +- go.mod | 4 +- go.sum | 8 + interagtiontest/CHANGELOG.md | 10 ++ interagtiontest/interationtest_test.go | 197 ++++++++++++++++++++++++ internal/api/handlers/common/api.go | 2 +- internal/api/handlers/common/common.go | 8 +- internal/api/handlers/handlers.go | 44 ++++-- internal/api/handlers/task/api.go | 4 +- internal/api/handlers/task/task.go | 12 +- internal/api/handlers/task/task_test.go | 2 +- internal/api/handlers/user/api.go | 2 +- internal/api/handlers/user/user.go | 14 +- internal/api/handlers/user/user_test.go | 51 +++++- internal/api/handlers/user/var_test.go | 6 + internal/api/routes/routes.go | 8 +- internal/api/routes/routes_test.go | 2 +- internal/driver/driver.go | 2 +- internal/pkg/responses/responses.go | 2 +- internal/repositories/auth/auth.go | 14 +- internal/repositories/auth/auth_test.go | 7 +- internal/repositories/task/task.go | 6 +- internal/repositories/task/task_test.go | 2 +- internal/repositories/task/var_test.go | 2 +- internal/repositories/user/user.go | 6 +- internal/repositories/user/user_test.go | 2 +- internal/usecases/task/interface.go | 2 +- internal/usecases/task/task.go | 2 +- internal/usecases/user/interface.go | 2 +- internal/usecases/user/user.go | 2 +- utils/utils.go | 1 + 33 files changed, 372 insertions(+), 81 deletions(-) create mode 100644 interagtiontest/CHANGELOG.md create mode 100644 interagtiontest/interationtest_test.go diff --git a/.env b/.env index 8f6c3eec0..a8080a633 100644 --- a/.env +++ b/.env @@ -5,6 +5,8 @@ PORT=8000 JWT_KEY=eyJhbGciOiJIUzI1NiJ9 JWT_TIMEOUT=60 +HOST="localhost" + # Setup DB DB_DRIVER="postgres" DB_HOST="localhost" @@ -16,4 +18,7 @@ DB_SSL_MODE="disable" DSN_POSTGRES="host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE}" # URL for migration -POSTGRESQL_URL_MIGRATION="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSL_MODE}" \ No newline at end of file +POSTGRESQL_URL_MIGRATION="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSL_MODE}" + +# INTERGRATION_TEST +INTERGRATION_TEST_PORT=8080 diff --git a/cmd/main.go b/cmd/main.go index e187860ca..f4155f049 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,12 +4,12 @@ import ( "fmt" "log" - "example.com/m/v2/cmd/middlewares" - "example.com/m/v2/constants" - "example.com/m/v2/internal/api/handlers" - "example.com/m/v2/internal/api/routes" - "example.com/m/v2/internal/driver" - "example.com/m/v2/utils" + "github.com/manabie-com/togo/cmd/middlewares" + "github.com/manabie-com/togo/constants" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/api/routes" + "github.com/manabie-com/togo/internal/driver" + "github.com/manabie-com/togo/utils" "github.com/gin-gonic/gin" "github.com/pkg/errors" @@ -34,11 +34,9 @@ func run() error { { // Set Middlewares // Midlewares - r.Use(gin.Logger()) // Recovery middleware recovers from any panics and writes a 500 if there was one. r.Use(gin.Recovery()) r.Use(middlewares.SetDefaultMiddleWare()) - r.Use(middlewares.ValidateToken()) } { //Set Repository diff --git a/cmd/middlewares/middlewares.go b/cmd/middlewares/middlewares.go index 4c1919e47..9ce8d0f32 100644 --- a/cmd/middlewares/middlewares.go +++ b/cmd/middlewares/middlewares.go @@ -3,9 +3,9 @@ package middlewares import ( "log" - "example.com/m/v2/constants" - "example.com/m/v2/internal/api/handlers" - "example.com/m/v2/utils" + "github.com/manabie-com/togo/constants" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/utils" "github.com/gin-gonic/gin" ) diff --git a/go.mod b/go.mod index 21f7d9306..5a2bb4ace 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module example.com/m/v2 +module github.com/manabie-com/togo go 1.17 @@ -9,10 +9,12 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.8.1 // indirect + github.com/go-chi/chi/v5 v5.0.7 github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-json v0.9.7 // indirect + github.com/golang-migrate/migrate v3.5.4+incompatible github.com/google/uuid v1.3.0 // indirect github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect diff --git a/go.sum b/go.sum index 7a21a0dcb..cf74e15d2 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= +github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= @@ -26,6 +28,8 @@ github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXS github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA= +github.com/golang-migrate/migrate v3.5.4+incompatible/go.mod h1:IsVUlFN5puWOmXrqjgGUfIRIbU7mr8oNBE2tyERd9Wk= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -67,8 +71,11 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -91,6 +98,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxW golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/interagtiontest/CHANGELOG.md b/interagtiontest/CHANGELOG.md new file mode 100644 index 000000000..36994c61b --- /dev/null +++ b/interagtiontest/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create `intergationtest` diff --git a/interagtiontest/interationtest_test.go b/interagtiontest/interationtest_test.go new file mode 100644 index 000000000..7d7bddc35 --- /dev/null +++ b/interagtiontest/interationtest_test.go @@ -0,0 +1,197 @@ +package interagtiontest + +import ( + "bytes" + "encoding/json" + "fmt" + "io/ioutil" + "log" + "net/http" + "strconv" + "testing" + + "github.com/manabie-com/togo/constants" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/usecases/auth" + "github.com/manabie-com/togo/utils" + + "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/postgres" + _ "github.com/lib/pq" + "github.com/stretchr/testify/suite" +) + +type IntegrationTestSuite struct { + suite.Suite + host string + port int + dbConn *gorm.DB +} + +func (s *IntegrationTestSuite) SetupSuite() { + utils.LoadEnv("../.env") + + port, err := strconv.Atoi(utils.Env.Port) + if err != nil { + log.Fatal("Can't getenv", err) + } + + s.port = port + s.host = utils.Env.Host +} + +func TestIntegrationSuite(t *testing.T) { + suite.Run(t, &IntegrationTestSuite{}) +} + +func (s *IntegrationTestSuite) TestIntegration_Login_Success() { + reqBodyStr := `{"username": "manabie", "password": "example"}` + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/login", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + + req.Header.Set("Content-Type", "application/json") + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(http.StatusOK, response.StatusCode) +} + +func (s *IntegrationTestSuite) TestIntegration_Login_Error() { + reqBodyStr := `{"username": "username1", "password": "123456"}` + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/login", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + + req.Header.Set("Content-Type", "application/json") + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + + s.Require().Equal(http.StatusBadRequest, response.StatusCode) +} + +func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { + // get token + repositories := handlers.NewRepositories(s.dbConn) + authUsecase := auth.NewAuthUseCase(repositories.Auth) + token, err := authUsecase.GenerateToken("firstUser", "5") + s.Require().NoError(err) + + reqBodyStr := `{ + "content": "task_success", + "create_date": "2022-06-22", + "userID": "firstUser" + }` + + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/tasks", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + req.Header.Set("Content-Type", "application/json") + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(http.StatusOK, response.StatusCode) +} + +func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { + // get token + repositories := handlers.NewRepositories(s.dbConn) + authUsecase := auth.NewAuthUseCase(repositories.Auth) + token, err := authUsecase.GenerateToken("firstUser1", "5") + s.Require().NoError(err) + + reqBodyStr := `{ + "content": "task_success", + "create_date": "2022-06-22", + "userID": "firstUser1" + }` + + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/tasks", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + req.Header.Set("Content-Type", "application/json") + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(response.StatusCode, http.StatusBadRequest) + +} + +func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { + reqBodyStr := `{ + "username": "manabie2", + "password": "123456", + "max_task_per_day": 2 + }` + + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/users", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(http.StatusOK, response.StatusCode) + + byteResBody, err := ioutil.ReadAll(response.Body) + s.Require().NoError(err) + + data := map[string]interface{}{} + err = json.Unmarshal(byteResBody, &data) + s.Require().NoError(err) + + byteUser, err := json.Marshal(data["data"]) + s.Require().NoError(err) + + user := models.User{} + err = json.Unmarshal(byteUser, &user) + s.Require().NoError(err) + + s.Require().Equal(user.Username, "manabie2") +} + +func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail() { + // get token + repositories := handlers.NewRepositories(s.dbConn) + authUsecase := auth.NewAuthUseCase(repositories.Auth) + token, err := authUsecase.GenerateToken("firstUser1", "5") + s.Require().NoError(err) + + reqBodyStr := `{ + "username": "manabie", + "password": "123456", + "max_task_per_day": 2 + }` + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/users", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(http.StatusConflict, response.StatusCode) +} diff --git a/internal/api/handlers/common/api.go b/internal/api/handlers/common/api.go index 7edd13a16..38d40e18b 100644 --- a/internal/api/handlers/common/api.go +++ b/internal/api/handlers/common/api.go @@ -1,7 +1,7 @@ package common import ( - "example.com/m/v2/internal/api/handlers" + "github.com/manabie-com/togo/internal/api/handlers" "github.com/gin-gonic/gin" ) diff --git a/internal/api/handlers/common/common.go b/internal/api/handlers/common/common.go index 00bcee8fd..6c00ba909 100644 --- a/internal/api/handlers/common/common.go +++ b/internal/api/handlers/common/common.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "example.com/m/v2/constants" - "example.com/m/v2/internal/api/handlers" - "example.com/m/v2/internal/pkg/responses" - "example.com/m/v2/utils" + "github.com/manabie-com/togo/constants" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/pkg/responses" + "github.com/manabie-com/togo/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/api/handlers/handlers.go b/internal/api/handlers/handlers.go index 8d30efd45..7976d86f4 100644 --- a/internal/api/handlers/handlers.go +++ b/internal/api/handlers/handlers.go @@ -3,15 +3,15 @@ package handlers import ( "fmt" - "example.com/m/v2/constants" - authRepo "example.com/m/v2/internal/repositories/auth" - taskRepo "example.com/m/v2/internal/repositories/task" - userRepo "example.com/m/v2/internal/repositories/user" - "example.com/m/v2/utils" + "github.com/manabie-com/togo/constants" + authRepo "github.com/manabie-com/togo/internal/repositories/auth" + taskRepo "github.com/manabie-com/togo/internal/repositories/task" + userRepo "github.com/manabie-com/togo/internal/repositories/user" + "github.com/manabie-com/togo/utils" - authService "example.com/m/v2/internal/usecases/auth" - taskService "example.com/m/v2/internal/usecases/task" - userService "example.com/m/v2/internal/usecases/user" + authService "github.com/manabie-com/togo/internal/usecases/auth" + taskService "github.com/manabie-com/togo/internal/usecases/task" + userService "github.com/manabie-com/togo/internal/usecases/user" "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" @@ -25,6 +25,12 @@ type MainUseCase struct { Task taskService.TaskUseCase } +type MainRepository struct { + Auth authService.AuthRepository + User userService.UserRepository + Task taskService.TaskRepository +} + var MainUC = &MainUseCase{} func SetMainUseCase(muc *MainUseCase) { @@ -33,14 +39,12 @@ func SetMainUseCase(muc *MainUseCase) { func NewUseCase(db *gorm.DB) MainUseCase { // Create repositories. - authRepository := authRepo.NewAuthRepository(db) - userRepository := userRepo.NewUserRepository(db) - taskRepository := taskRepo.NewTaskRepository(db) + mainRepositories := NewRepositories(db) //Create UseCase - authUseCase := authService.NewAuthUseCase(authRepository) - userUseCase := userService.NewUserUseCase(userRepository) - taskUseCase := taskService.NewTaskUseCase(taskRepository) + authUseCase := authService.NewAuthUseCase(mainRepositories.Auth) + userUseCase := userService.NewUserUseCase(mainRepositories.User) + taskUseCase := taskService.NewTaskUseCase(mainRepositories.Task) return MainUseCase{ Auth: authUseCase, @@ -49,6 +53,18 @@ func NewUseCase(db *gorm.DB) MainUseCase { } } +func HandleService(db *gorm.DB) MainUseCase { + return NewUseCase(db) +} + +func NewRepositories(db *gorm.DB) *MainRepository { + return &MainRepository{ + Auth: authRepo.NewAuthRepository(db), + User: userRepo.NewUserRepository(db), + Task: taskRepo.NewTaskRepository(db), + } +} + type UserInfoFromCtx string type UserInfoFromToken struct { ID string diff --git a/internal/api/handlers/task/api.go b/internal/api/handlers/task/api.go index 09277e388..402002f36 100644 --- a/internal/api/handlers/task/api.go +++ b/internal/api/handlers/task/api.go @@ -1,13 +1,15 @@ package task import ( - "example.com/m/v2/internal/api/handlers" + "github.com/manabie-com/togo/cmd/middlewares" + "github.com/manabie-com/togo/internal/api/handlers" "github.com/gin-gonic/gin" ) func NewHandler(router *gin.Engine, service handlers.MainUseCase) { apiTask := router.Group("/tasks") + apiTask.Use(middlewares.ValidateToken()) { apiTask.POST("/", AddTask(service)) } diff --git a/internal/api/handlers/task/task.go b/internal/api/handlers/task/task.go index ab498d801..a96b62b5c 100644 --- a/internal/api/handlers/task/task.go +++ b/internal/api/handlers/task/task.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "example.com/m/v2/internal/api/handlers" - "example.com/m/v2/internal/models" - "example.com/m/v2/internal/pkg/responses" - "example.com/m/v2/internal/repositories/task" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/pkg/responses" + "github.com/manabie-com/togo/internal/repositories/task" "github.com/gin-gonic/gin" ) @@ -44,8 +44,8 @@ func AddTask(service handlers.MainUseCase) gin.HandlerFunc { // Mapping Request input := models.Task{} - if err := ctx.ShouldBindJSON(&input); err != nil { - responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail BindJSON user") + if err := ctx.BindJSON(&input); err != nil { + responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail BindJSON task") return } input.UserID = userInfo.ID diff --git a/internal/api/handlers/task/task_test.go b/internal/api/handlers/task/task_test.go index 58df70370..f630b247f 100644 --- a/internal/api/handlers/task/task_test.go +++ b/internal/api/handlers/task/task_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "example.com/m/v2/internal/api/handlers" "github.com/gin-gonic/gin" + "github.com/manabie-com/togo/internal/api/handlers" ) func TestAddTask(t *testing.T) { diff --git a/internal/api/handlers/user/api.go b/internal/api/handlers/user/api.go index 445abeedd..b19e0a842 100644 --- a/internal/api/handlers/user/api.go +++ b/internal/api/handlers/user/api.go @@ -1,7 +1,7 @@ package user import ( - "example.com/m/v2/internal/api/handlers" + "github.com/manabie-com/togo/internal/api/handlers" "github.com/gin-gonic/gin" ) diff --git a/internal/api/handlers/user/user.go b/internal/api/handlers/user/user.go index eebcb87c1..993e3e899 100644 --- a/internal/api/handlers/user/user.go +++ b/internal/api/handlers/user/user.go @@ -3,10 +3,10 @@ package user import ( "net/http" - "example.com/m/v2/internal/api/handlers" - "example.com/m/v2/internal/models" - "example.com/m/v2/internal/pkg/responses" - "example.com/m/v2/internal/repositories/user" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/pkg/responses" + "github.com/manabie-com/togo/internal/repositories/user" "github.com/gin-gonic/gin" ) @@ -20,19 +20,19 @@ type Input struct { func CreateUser(service handlers.MainUseCase) gin.HandlerFunc { return func(ctx *gin.Context) { var inputUser Input - if err := ctx.Bind(&inputUser); err != nil { + if err := ctx.ShouldBindJSON(&inputUser); err != nil { responses.ResponseForError(ctx, err, http.StatusInternalServerError, "Fail BindJSON user") return } isExistUser, err := service.Auth.ValidateUser(inputUser.Username) if err != nil { - responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail ValidateUser") + responses.ResponseForError(ctx, err, http.StatusInternalServerError, "Fail ValidateUser") return } if isExistUser { - responses.ResponseForError(ctx, nil, http.StatusForbidden, "User is exists") + responses.ResponseForError(ctx, nil, http.StatusConflict, "User is exists") return } diff --git a/internal/api/handlers/user/user_test.go b/internal/api/handlers/user/user_test.go index cea8b9a8c..7134a832d 100644 --- a/internal/api/handlers/user/user_test.go +++ b/internal/api/handlers/user/user_test.go @@ -1,10 +1,59 @@ package user import ( + "bytes" + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "regexp" "testing" + + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/models" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateUser(t *testing.T) { t.Parallel() - + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/users", CreateUser(service)) + + { //Success case + input := &models.User{ + ID: "1", + Username: "Manabie-1", + Password: "123456", + MaxTaskPerDay: 5, + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnError(fmt.Errorf("")) + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) + mock.ExpectCommit() + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusCreated, w.Code) + + } } diff --git a/internal/api/handlers/user/var_test.go b/internal/api/handlers/user/var_test.go index 1e42db66c..b6af97ed9 100644 --- a/internal/api/handlers/user/var_test.go +++ b/internal/api/handlers/user/var_test.go @@ -2,6 +2,7 @@ package user import ( "github.com/DATA-DOG/go-sqlmock" + "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" "github.com/pkg/errors" ) @@ -24,6 +25,11 @@ func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { return db, mock, nil } +func SetUpRouter() *gin.Engine { + router := gin.Default() + return router +} + // func recordStats(db *gorm.DB, username, password string) (err error) { // _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) // if err != nil { diff --git a/internal/api/routes/routes.go b/internal/api/routes/routes.go index 880f7b7ed..491f05107 100644 --- a/internal/api/routes/routes.go +++ b/internal/api/routes/routes.go @@ -1,10 +1,10 @@ package routes import ( - "example.com/m/v2/internal/api/handlers" - "example.com/m/v2/internal/api/handlers/common" - "example.com/m/v2/internal/api/handlers/task" - "example.com/m/v2/internal/api/handlers/user" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/api/handlers/common" + "github.com/manabie-com/togo/internal/api/handlers/task" + "github.com/manabie-com/togo/internal/api/handlers/user" "github.com/gin-gonic/gin" ) diff --git a/internal/api/routes/routes_test.go b/internal/api/routes/routes_test.go index b64d53bb2..3040f9bd3 100644 --- a/internal/api/routes/routes_test.go +++ b/internal/api/routes/routes_test.go @@ -3,8 +3,8 @@ package routes import ( "testing" - "example.com/m/v2/internal/api/handlers" "github.com/gin-gonic/gin" + "github.com/manabie-com/togo/internal/api/handlers" ) func TestSetupRoute(t *testing.T) { diff --git a/internal/driver/driver.go b/internal/driver/driver.go index ee18a13d0..95484b6cf 100644 --- a/internal/driver/driver.go +++ b/internal/driver/driver.go @@ -3,7 +3,7 @@ package driver import ( "fmt" - "example.com/m/v2/utils" + "github.com/manabie-com/togo/utils" "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/postgres" diff --git a/internal/pkg/responses/responses.go b/internal/pkg/responses/responses.go index 5416c57f3..bbd2851ec 100644 --- a/internal/pkg/responses/responses.go +++ b/internal/pkg/responses/responses.go @@ -1,7 +1,7 @@ package responses import ( - "example.com/m/v2/constants" + "github.com/manabie-com/togo/constants" "github.com/gin-gonic/gin" ) diff --git a/internal/repositories/auth/auth.go b/internal/repositories/auth/auth.go index 4ff69fd2d..068bfbe31 100644 --- a/internal/repositories/auth/auth.go +++ b/internal/repositories/auth/auth.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "example.com/m/v2/internal/models" - "example.com/m/v2/internal/usecases/auth" - "example.com/m/v2/utils" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/usecases/auth" + "github.com/manabie-com/togo/utils" "github.com/dgrijalva/jwt-go" "github.com/jinzhu/gorm" @@ -31,12 +31,10 @@ func (r *repository) ValidateUser(username string) (bool, error) { } user := &models.User{} - if err := r.DB.Where("username = ?", username).First(user).Error; err != nil { - return false, err - } + r.DB.Where("username = ?", username).First(user) - if user != nil && user.Username != "" { - return true, nil + if user == nil || user.Username == "" { + return false, nil } return true, nil diff --git a/internal/repositories/auth/auth_test.go b/internal/repositories/auth/auth_test.go index 2de50da3f..efb7585ae 100644 --- a/internal/repositories/auth/auth_test.go +++ b/internal/repositories/auth/auth_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "example.com/m/v2/utils" "github.com/DATA-DOG/go-sqlmock" + "github.com/manabie-com/togo/utils" "github.com/stretchr/testify/require" ) @@ -60,7 +60,7 @@ func Test_repository_ValidateUser(t *testing.T) { t.Errorf("at least 1 expectation was not met: %s", err) } } - { // Fail case + { // Success case: Not have user user := userValidate{ Username: "fail_name", Password: "fail_pass", @@ -71,8 +71,7 @@ func Test_repository_ValidateUser(t *testing.T) { WithArgs(user.Username). WillReturnError(fmt.Errorf("invalid user")) - actual, err := authRepository.ValidateUser(user.Username) - require.NotNil(t, err) + actual, _ := authRepository.ValidateUser(user.Username) require.Equal(t, user.Expect, actual) if err := mock.ExpectationsWereMet(); err != nil { diff --git a/internal/repositories/task/task.go b/internal/repositories/task/task.go index ce30193e5..bf73b3fe0 100644 --- a/internal/repositories/task/task.go +++ b/internal/repositories/task/task.go @@ -1,9 +1,9 @@ package task import ( - "example.com/m/v2/internal/models" - "example.com/m/v2/internal/pkg/id" - "example.com/m/v2/internal/usecases/task" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/pkg/id" + "github.com/manabie-com/togo/internal/usecases/task" "github.com/jinzhu/gorm" "github.com/pkg/errors" diff --git a/internal/repositories/task/task_test.go b/internal/repositories/task/task_test.go index 121607afe..a185ee048 100644 --- a/internal/repositories/task/task_test.go +++ b/internal/repositories/task/task_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "example.com/m/v2/internal/models" + "github.com/manabie-com/togo/internal/models" "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/require" diff --git a/internal/repositories/task/var_test.go b/internal/repositories/task/var_test.go index 4f3d4c99a..745eb0f56 100644 --- a/internal/repositories/task/var_test.go +++ b/internal/repositories/task/var_test.go @@ -3,7 +3,7 @@ package task import ( "fmt" - "example.com/m/v2/internal/models" + "github.com/manabie-com/togo/internal/models" "github.com/DATA-DOG/go-sqlmock" "github.com/jinzhu/gorm" diff --git a/internal/repositories/user/user.go b/internal/repositories/user/user.go index b6b816e62..e9ebcfaeb 100644 --- a/internal/repositories/user/user.go +++ b/internal/repositories/user/user.go @@ -1,9 +1,9 @@ package user import ( - "example.com/m/v2/internal/models" - "example.com/m/v2/internal/pkg/id" - "example.com/m/v2/internal/usecases/user" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/pkg/id" + "github.com/manabie-com/togo/internal/usecases/user" "github.com/jinzhu/gorm" "github.com/pkg/errors" diff --git a/internal/repositories/user/user_test.go b/internal/repositories/user/user_test.go index 8e76a66fa..e3e481f1e 100644 --- a/internal/repositories/user/user_test.go +++ b/internal/repositories/user/user_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "example.com/m/v2/internal/models" "github.com/DATA-DOG/go-sqlmock" + "github.com/manabie-com/togo/internal/models" "github.com/stretchr/testify/require" ) diff --git a/internal/usecases/task/interface.go b/internal/usecases/task/interface.go index f13d2ee6a..fbd39ce85 100644 --- a/internal/usecases/task/interface.go +++ b/internal/usecases/task/interface.go @@ -1,7 +1,7 @@ package task import ( - "example.com/m/v2/internal/models" + "github.com/manabie-com/togo/internal/models" ) type Reader interface { diff --git a/internal/usecases/task/task.go b/internal/usecases/task/task.go index fd8045296..e726428e8 100644 --- a/internal/usecases/task/task.go +++ b/internal/usecases/task/task.go @@ -1,7 +1,7 @@ package task import ( - "example.com/m/v2/internal/models" + "github.com/manabie-com/togo/internal/models" ) // TaskUseCaseUsecase is the definition for collection of methods related to the `users` table use case diff --git a/internal/usecases/user/interface.go b/internal/usecases/user/interface.go index a21e7b5a1..8167980e5 100644 --- a/internal/usecases/user/interface.go +++ b/internal/usecases/user/interface.go @@ -1,7 +1,7 @@ package user import ( - "example.com/m/v2/internal/models" + "github.com/manabie-com/togo/internal/models" ) type Reader interface { diff --git a/internal/usecases/user/user.go b/internal/usecases/user/user.go index 6610dcfb0..0d6c8e306 100644 --- a/internal/usecases/user/user.go +++ b/internal/usecases/user/user.go @@ -1,7 +1,7 @@ package user import ( - "example.com/m/v2/internal/models" + "github.com/manabie-com/togo/internal/models" ) // UserUsecase is the definition for collection of methods related to the `users` table use case diff --git a/utils/utils.go b/utils/utils.go index 920e8a068..b76891ea9 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -34,6 +34,7 @@ func RemoveDuplicate(s []string) []string { } type Environment struct { + Host string `env:"HOST"` Port string `env:"PORT"` JwtKey string `env:"JWT_KEY"` JwtTimeout string `env:"JWT_TIMEOUT"` From 948aef24d678bb7fcaef595e9957176a03ec666b Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 22:45:33 +0700 Subject: [PATCH 14/61] Change name integrationtest --- CHANGELOG.md | 1 + {interagtiontest => integrationtest}/CHANGELOG.md | 0 .../integrationtest_test.go | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename {interagtiontest => integrationtest}/CHANGELOG.md (100%) rename interagtiontest/interationtest_test.go => integrationtest/integrationtest_test.go (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5519f9510..970b3219d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,5 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Make create `integrationtest` - Make create terminal in `Makefile` - Initial and structure for project diff --git a/interagtiontest/CHANGELOG.md b/integrationtest/CHANGELOG.md similarity index 100% rename from interagtiontest/CHANGELOG.md rename to integrationtest/CHANGELOG.md diff --git a/interagtiontest/interationtest_test.go b/integrationtest/integrationtest_test.go similarity index 99% rename from interagtiontest/interationtest_test.go rename to integrationtest/integrationtest_test.go index 7d7bddc35..f2080ae0c 100644 --- a/interagtiontest/interationtest_test.go +++ b/integrationtest/integrationtest_test.go @@ -1,4 +1,4 @@ -package interagtiontest +package integrationtest import ( "bytes" From 3132daaf093d3326ecbd20831428acb905a7fb48 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 22:47:03 +0700 Subject: [PATCH 15/61] Add image flow --- document/Flow-AddTask.svg | 4 ++++ document/Flow-CreateUser.svg | 4 ++++ document/Flow-Login.svg | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 document/Flow-AddTask.svg create mode 100644 document/Flow-CreateUser.svg create mode 100644 document/Flow-Login.svg diff --git a/document/Flow-AddTask.svg b/document/Flow-AddTask.svg new file mode 100644 index 000000000..f7818c739 --- /dev/null +++ b/document/Flow-AddTask.svg @@ -0,0 +1,4 @@ + + + +
alt
altClientAdd Task
Fail case
Fail case
Success case
Success caseAPI
Validate task per day
Validate task per dayResponsePOST /tasksAuthResponseTaskDatabaseResponseCheck login by tokenResponseResponseGet  list tasks by user and createDateResponseGet list tasksResponseCreate TaskCreate TaskText is not SVG - cannot display \ No newline at end of file diff --git a/document/Flow-CreateUser.svg b/document/Flow-CreateUser.svg new file mode 100644 index 000000000..4e0f7961d --- /dev/null +++ b/document/Flow-CreateUser.svg @@ -0,0 +1,4 @@ + + + +
alt
altClientCreate User
Have user
Have userAPIResponsePOST /usersAuthResponseUserResponseDatabaseResponseCreate UserValidate user with usernameFind user with usernameResponse
Check user is exists
Check user is exists
Not have user
Not have userCreate UserResponseText is not SVG - cannot display \ No newline at end of file diff --git a/document/Flow-Login.svg b/document/Flow-Login.svg new file mode 100644 index 000000000..c2b954269 --- /dev/null +++ b/document/Flow-Login.svg @@ -0,0 +1,4 @@ + + + +
alt
altClientLoginAPIPOST /login UserDatabaseFind user by username and passwordResponseRequest username and password
Fail case
Fail caseResponseResponse
Success case
Success caseResponse
Generate token and save in cookie
Generate token and save in cookieText is not SVG - cannot display \ No newline at end of file From 7bcd0a4cec11437ff4cacaf4aabd2606ad688600 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 22:52:31 +0700 Subject: [PATCH 16/61] Add ERD --- document/ERD.svg | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 document/ERD.svg diff --git a/document/ERD.svg b/document/ERD.svg new file mode 100644 index 000000000..624ec7367 --- /dev/null +++ b/document/ERD.svg @@ -0,0 +1,4 @@ + + + +tasksPKid varchar(50) NOT NULLFK1user_id varchar(50) NOT NULLcontent varchar(50)UsersPKid varchar(50) NOT NULL username varchar(50)password varchar(50)max_task_per_day intergercreate_date varchar(50) \ No newline at end of file From 16e0a810cc7a94221491f1fe7b4814d78b4f3d75 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 22:54:12 +0700 Subject: [PATCH 17/61] Remove unused --- internal/repositories/user/user.go | 17 ------- internal/repositories/user/user_test.go | 64 ------------------------- internal/usecases/user/interface.go | 1 - internal/usecases/user/user.go | 6 --- 4 files changed, 88 deletions(-) diff --git a/internal/repositories/user/user.go b/internal/repositories/user/user.go index e9ebcfaeb..523224af6 100644 --- a/internal/repositories/user/user.go +++ b/internal/repositories/user/user.go @@ -28,23 +28,6 @@ func New(user *models.User) *models.User { } } -// GetByUsername implements user.UserRepository -func (r *repository) GetByUsername(username string) (*models.User, error) { - if username == "" { - return nil, errors.New("Input empty") - } - - user := &models.User{} - if err := r.DB.Where("username = ?", username).First(user).Error; err != nil { - return nil, errors.Wrap(err, "Fail query user") - } - - if user == nil { - return nil, errors.New("User is not exists") - } - return user, nil -} - // Create implements user.UserRepository func (r *repository) Create(inputUser *models.User) error { if inputUser == nil || inputUser.Username == "" || inputUser.Password == "" { diff --git a/internal/repositories/user/user_test.go b/internal/repositories/user/user_test.go index e3e481f1e..21400e4fe 100644 --- a/internal/repositories/user/user_test.go +++ b/internal/repositories/user/user_test.go @@ -10,70 +10,6 @@ import ( "github.com/stretchr/testify/require" ) -func Test_repository_GetByUsername(t *testing.T) { - t.Parallel() - db, mock, err := setupMock() - if err != nil { - t.Fatalf("an error '%s' was not expected when opening stub database connection", err) - } - require.Nil(t, err) - require.NotNil(t, mock) - require.NotNil(t, db) - - defer db.Close() - - userRepository := NewUserRepository(db) - - { //Success case - input := &models.User{ - Username: "manabie_1", - Password: "manabie_1", - } - // Create mock data for test - mock.ExpectExec("INSERT INTO users"). - WithArgs(1, input.Username, input.Password, 5). - WillReturnResult(sqlmock.NewResult(1, 1)) - - // Create Data - err := recordStats(db, input.Username, input.Password) - require.Nil(t, err) - - rows := sqlmock.NewRows([]string{"id", "username", "password", "max_task_per_day"}). - AddRow("1", input.Username, input.Password, 5) - mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). - WithArgs(input.Username). - WillReturnRows(rows) - - user, err := userRepository.GetByUsername(input.Username) - require.Nil(t, err) - require.NotNil(t, user) - require.Equal(t, input.Username, user.Username) - require.Equal(t, input.Password, user.Password) - - if err := mock.ExpectationsWereMet(); err != nil { - t.Errorf("at least 1 expectation was not met: %s", err) - } - } - { // Fail case - input := &models.User{ - Username: "manabie_2", - Password: "manabie_2", - } - - mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). - WithArgs(input.Username). - WillReturnError(fmt.Errorf("invalid username")) - - user, err := userRepository.GetByUsername(input.Username) - require.NotNil(t, err) - require.Nil(t, user) - - if err := mock.ExpectationsWereMet(); err != nil { - t.Errorf("at least 1 expectation was not met: %s", err) - } - } -} - func Test_repository_Create(t *testing.T) { t.Parallel() db, mock, err := setupMock() diff --git a/internal/usecases/user/interface.go b/internal/usecases/user/interface.go index 8167980e5..eda8b3617 100644 --- a/internal/usecases/user/interface.go +++ b/internal/usecases/user/interface.go @@ -5,7 +5,6 @@ import ( ) type Reader interface { - GetByUsername(username string) (*models.User, error) Login(username, password string) (*models.User, error) } diff --git a/internal/usecases/user/user.go b/internal/usecases/user/user.go index 0d6c8e306..cd767b4f0 100644 --- a/internal/usecases/user/user.go +++ b/internal/usecases/user/user.go @@ -7,7 +7,6 @@ import ( // UserUsecase is the definition for collection of methods related to the `users` table use case type UserUseCase interface { Login(username, password string) (*models.User, error) - GetUserByUsername(username string) (*models.User, error) Create(u *models.User) error } @@ -20,11 +19,6 @@ func NewUserUseCase(repository UserRepository) UserUseCase { return &userUseCaseRepository{repository: repository} } -// GetUserByUsername implements UserUseCase -func (uc *userUseCaseRepository) GetUserByUsername(username string) (*models.User, error) { - return uc.repository.GetByUsername(username) -} - // Login implements UserUseCase func (uc *userUseCaseRepository) Login(username, password string) (*models.User, error) { return uc.repository.Login(username, password) From db8bc94e94d9a25540d1f3706d290288e84b46ca Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 22:54:39 +0700 Subject: [PATCH 18/61] Remove create record --- internal/repositories/user/var_test.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/internal/repositories/user/var_test.go b/internal/repositories/user/var_test.go index e9b3187ea..998c2bcd3 100644 --- a/internal/repositories/user/var_test.go +++ b/internal/repositories/user/var_test.go @@ -1,8 +1,6 @@ package user import ( - "fmt" - "github.com/DATA-DOG/go-sqlmock" "github.com/jinzhu/gorm" "github.com/pkg/errors" @@ -25,11 +23,3 @@ func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { return db, mock, nil } - -func recordStats(db *gorm.DB, username, password string) (err error) { - _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) - if err != nil { - return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) - } - return -} From 46f5bdd8eaabb13ee1ee48dde6709a218055b401 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 23:21:14 +0700 Subject: [PATCH 19/61] Add README --- README.md | 88 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 8df9d4d3a..9f62a5edb 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,74 @@ -### Requirements +# Duong Thanh Tin - Test Manabie -- Implement one single API which accepts a todo task and records it - - There is a maximum **limit of N tasks per user** that can be added **per day**. - - Different users can have **different** maximum daily limit. -- Write integration (functional) tests -- Write unit tests -- Choose a suitable architecture to make your code simple, organizable, and maintainable -- Write a concise README - - How to run your code locally? - - A sample “curl” command to call your API - - How to run your unit tests locally? - - What do you love about your solution? - - What else do you want us to know about however you do not have enough time to complete? +## Togo Respository -### Notes +### Features +The repository have a few main features +``` +- Login +- Create user +- Add task by user and create date +``` -- We're using Golang at Manabie. **However**, we encourage you to use the programming language that you are most comfortable with because we want you to **shine** with all your skills and knowledge. +### Diagrams -### How to submit your solution? +1. #### Sequence Diagram For Flow Feature +- Feature Login +![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/Flow-Login.svg) -- Fork this repo and show us your development progress via a PR +- Feature Create User +![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/Flow-CreateUser.svg) -### Interesting facts about Manabie +- Feature Add Task +![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/Flow-AddTask.svg) -- Monthly there are about 2 million lines of code changes (inserted/updated/deleted) committed into our GitHub repositories. To avoid **regression bugs**, we write different kinds of **automated tests** (unit/integration (functionality)/end2end) as parts of the definition of done of our assigned tasks. -- We nurture the cultural values: **knowledge sharing** and **good communication**, therefore good written documents and readable, organizable, and maintainable code are in our blood when we build any features to grow our products. -- We have **collaborative** culture at Manabie. Feel free to ask trieu@manabie.com any questions. We are very happy to answer all of them. +2. #### ERD Diagram -Thank you for spending time to read and attempt our take-home assessment. We are looking forward to your submission. +![ERD](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/ERD.svg) + +### Structure Project + +``` +- api --> You can create different output commands like Api rest, web, GRPC or any other technology. + |- fiber --> structure fiber api +- cmd --> Main applications for this project. + |- middlewares --> Middlewares for this project +- constants --> Contain variable common +- db --> Data for migrations + |- migrations -> You can migration up or down data +- documents --> Contain detail documents for this project +- integrationtest --> Run integration test +- internal + |- api --> You can create different output commands like Api rest, web, GRPC or any other technology. + |- handlers --> Contain API + |- common --> API for common + |- task --> API for task + |- user --> API for user + |- routes --> Make create route for API + |- driver --> Config connection to database + |- models --> Application models + |- pkg --> Make create function to use common + |- id --> Make create uuid + |- responses --> Make create many response data + |- repositories --> Repositoryies will action to database (CRUD) + |- auth --> Repository for auth + |- task --> Repository for task + |- user --> Repository for user + |- usecases --> Usecases to implement action for application + |- auth --> Usecase for auth + |- task --> Usecase for task + |- user --> Usecase for user +``` + +### How to start + +#### Start local +1. Clone repository +```bash +git clone https://github.com/DuongThanhTin/togo.git +``` +2. Run main.go +```bash +cd togo +go run cmd/main.go +``` From c0454f491df902ad93e061cc66e91d53933b0c3e Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 23:22:08 +0700 Subject: [PATCH 20/61] Remove unused --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 9f62a5edb..2133ddfe9 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,6 @@ The repository have a few main features ### Structure Project ``` -- api --> You can create different output commands like Api rest, web, GRPC or any other technology. - |- fiber --> structure fiber api - cmd --> Main applications for this project. |- middlewares --> Middlewares for this project - constants --> Contain variable common From a9941305b6f2f292dbd483360c3b930308acf8fd Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Sun, 26 Jun 2022 23:44:07 +0700 Subject: [PATCH 21/61] Add test for integration test --- db/migrations/4_alter_task.up.sql | 2 +- integrationtest/integrationtest_test.go | 41 ++++++++++++++++++++++--- internal/api/handlers/handlers.go | 10 +++--- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/db/migrations/4_alter_task.up.sql b/db/migrations/4_alter_task.up.sql index 3cee771e9..758fb8395 100644 --- a/db/migrations/4_alter_task.up.sql +++ b/db/migrations/4_alter_task.up.sql @@ -1,5 +1,5 @@ BEGIN; -INSERT INTO "public"."tasks" ("id", "content", "create_date", "user_id") VALUES ('1', 'manabie', '2022-06-22', 'firstUser'); +INSERT INTO "public"."tasks" ("id", "content", "create_date", "user_id") VALUES ('1', 'manabie', '2022-06-24', 'firstUser'); COMMIT; diff --git a/integrationtest/integrationtest_test.go b/integrationtest/integrationtest_test.go index f2080ae0c..b9bd81d83 100644 --- a/integrationtest/integrationtest_test.go +++ b/integrationtest/integrationtest_test.go @@ -45,6 +45,7 @@ func TestIntegrationSuite(t *testing.T) { suite.Run(t, &IntegrationTestSuite{}) } +//Login: Success case func (s *IntegrationTestSuite) TestIntegration_Login_Success() { reqBodyStr := `{"username": "manabie", "password": "example"}` req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/login", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) @@ -59,6 +60,7 @@ func (s *IntegrationTestSuite) TestIntegration_Login_Success() { s.Require().Equal(http.StatusOK, response.StatusCode) } +//Login: Fail case. Fail Find not have user func (s *IntegrationTestSuite) TestIntegration_Login_Error() { reqBodyStr := `{"username": "username1", "password": "123456"}` req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/login", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) @@ -71,7 +73,7 @@ func (s *IntegrationTestSuite) TestIntegration_Login_Error() { s.Require().NoError(err) defer response.Body.Close() - s.Require().Equal(http.StatusBadRequest, response.StatusCode) + s.Require().Equal(response.StatusCode, http.StatusBadRequest) } func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { @@ -83,7 +85,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { reqBodyStr := `{ "content": "task_success", - "create_date": "2022-06-22", + "create_date": "2022-06-24", "userID": "firstUser" }` @@ -113,7 +115,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { reqBodyStr := `{ "content": "task_success", - "create_date": "2022-06-22", + "create_date": "2022-06-24", "userID": "firstUser1" }` @@ -132,12 +134,42 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { s.Require().NoError(err) defer response.Body.Close() s.Require().Equal(response.StatusCode, http.StatusBadRequest) +} + +func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_NotLogin() { + // get token + repositories := handlers.NewRepositories(s.dbConn) + authUsecase := auth.NewAuthUseCase(repositories.Auth) + _, err := authUsecase.GenerateToken("user-success-1", "5") + s.Require().NoError(err) + + reqBodyStr := `{ + "content": "task-fail-1", + "create_date": "2022-06-24", + "userID": "user1" + }` + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/tasks", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + req.Header.Set("Content-Type", "application/json") + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: "", + MaxAge: 300, + } + req.AddCookie(cookie) + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(response.StatusCode, http.StatusUnauthorized) } +// CreateUser: Success case func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { reqBodyStr := `{ - "username": "manabie2", + "username": "manabie-new-1", "password": "123456", "max_task_per_day": 2 }` @@ -168,6 +200,7 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { s.Require().Equal(user.Username, "manabie2") } +// CreateUser: Fail case - Conflict User func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail() { // get token repositories := handlers.NewRepositories(s.dbConn) diff --git a/internal/api/handlers/handlers.go b/internal/api/handlers/handlers.go index 7976d86f4..3ef84a92c 100644 --- a/internal/api/handlers/handlers.go +++ b/internal/api/handlers/handlers.go @@ -91,7 +91,7 @@ func GetUserInfoFromToken(ctx *gin.Context) (*UserInfoFromToken, error) { } if utils.SafeString(tokenStr) == "" { - return nil, errors.New(fmt.Sprintf("Don't have cookie with Key2: %s", constants.CookieTokenKey)) + return nil, errors.New("Token is empty") } claims := make(jwt.MapClaims) @@ -100,21 +100,21 @@ func GetUserInfoFromToken(ctx *gin.Context) (*UserInfoFromToken, error) { }) if err != nil { - return nil, errors.New(fmt.Sprintf("Don't have cookie with Key3: %s", constants.CookieTokenKey)) + return nil, errors.Wrap(err, "Fail ParseWithClaims") } if tkn == nil || !tkn.Valid { - return nil, errors.New(fmt.Sprintf("Don't have cookie with Key4: %s", constants.CookieTokenKey)) + return nil, errors.New("Token is valid") } id, ok := claims["user_id"].(string) if !ok { - return nil, errors.New(fmt.Sprintf("Don't have cookie with Key5: %s", constants.CookieTokenKey)) + return nil, errors.New("Fail Claims user_id") } maxTaskPerDay, ok := claims["max_task_per_day"].(string) if !ok { - return nil, errors.New(fmt.Sprintf("Don't have cookie with Key6: %s", constants.CookieTokenKey)) + return nil, errors.New("Fail Claims max_task_per_day") } userInfo := &UserInfoFromToken{ From 3b789b0bfbccd591cce96fc34e9a0ecc7c9c271f Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 00:03:11 +0700 Subject: [PATCH 22/61] Add test for integration test --- Makefile | 4 ++ db/migrations/3_alter_user.up.sql | 1 + integrationtest/integrationtest_test.go | 66 +++++++++++++++++++++---- 3 files changed, 62 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c89424528..8178fc104 100644 --- a/Makefile +++ b/Makefile @@ -16,5 +16,9 @@ test-migration: @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up +integration-test: + cd cmd && go run main.go + cd .. && go test ./integrationtest + nodemon: nodemon --exec go run cmd/main.go --signal SIGTERM diff --git a/db/migrations/3_alter_user.up.sql b/db/migrations/3_alter_user.up.sql index b46914fdb..8be6dbf22 100644 --- a/db/migrations/3_alter_user.up.sql +++ b/db/migrations/3_alter_user.up.sql @@ -1,5 +1,6 @@ BEGIN; INSERT INTO "public"."users" (id, username, password, max_task_per_day) VALUES('firstUser','manabie' ,'example', 5); +INSERT INTO "public"."users" (id, username, password, max_task_per_day) VALUES('secondUser','manabie-test-1' ,'example', 0); COMMIT; diff --git a/integrationtest/integrationtest_test.go b/integrationtest/integrationtest_test.go index b9bd81d83..4037d2dd0 100644 --- a/integrationtest/integrationtest_test.go +++ b/integrationtest/integrationtest_test.go @@ -61,7 +61,7 @@ func (s *IntegrationTestSuite) TestIntegration_Login_Success() { } //Login: Fail case. Fail Find not have user -func (s *IntegrationTestSuite) TestIntegration_Login_Error() { +func (s *IntegrationTestSuite) TestIntegration_Login_Fail_WrongUsername() { reqBodyStr := `{"username": "username1", "password": "123456"}` req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/login", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) s.Require().NoError(err) @@ -76,6 +76,23 @@ func (s *IntegrationTestSuite) TestIntegration_Login_Error() { s.Require().Equal(response.StatusCode, http.StatusBadRequest) } +//Login: Fail case - Username is empty +func (s *IntegrationTestSuite) TestIntegration_Login_Fail_Validate() { + reqBodyStr := `{"username": "", "password": "123456"}` + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/login", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + + req.Header.Set("Content-Type", "application/json") + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + + s.Require().Equal(response.StatusCode, http.StatusBadRequest) +} + +// AddTask: Success case func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { // get token repositories := handlers.NewRepositories(s.dbConn) @@ -106,6 +123,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { s.Require().Equal(http.StatusOK, response.StatusCode) } +// AddTask: Fail case - Wrong userID func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { // get token repositories := handlers.NewRepositories(s.dbConn) @@ -114,7 +132,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { s.Require().NoError(err) reqBodyStr := `{ - "content": "task_success", + "content": "task_fail", "create_date": "2022-06-24", "userID": "firstUser1" }` @@ -136,17 +154,18 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { s.Require().Equal(response.StatusCode, http.StatusBadRequest) } -func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_NotLogin() { +// AddTask: Fail case - ValidateMaxTaskPerDay +func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_ValidateMaxTaskPerDay() { // get token repositories := handlers.NewRepositories(s.dbConn) authUsecase := auth.NewAuthUseCase(repositories.Auth) - _, err := authUsecase.GenerateToken("user-success-1", "5") + token, err := authUsecase.GenerateToken("secondUser", "0") s.Require().NoError(err) reqBodyStr := `{ "content": "task-fail-1", "create_date": "2022-06-24", - "userID": "user1" + "userID": "secondUser" }` req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/tasks", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) @@ -154,7 +173,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_NotLogin() { req.Header.Set("Content-Type", "application/json") cookie := &http.Cookie{ Name: constants.CookieTokenKey, - Value: "", + Value: utils.SafeString(token), MaxAge: 300, } req.AddCookie(cookie) @@ -163,7 +182,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_NotLogin() { response, err := client.Do(req) s.Require().NoError(err) defer response.Body.Close() - s.Require().Equal(response.StatusCode, http.StatusUnauthorized) + s.Require().Equal(response.StatusCode, http.StatusInternalServerError) } // CreateUser: Success case @@ -197,11 +216,11 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { err = json.Unmarshal(byteUser, &user) s.Require().NoError(err) - s.Require().Equal(user.Username, "manabie2") + s.Require().Equal(user.Username, "manabie-new-1") } // CreateUser: Fail case - Conflict User -func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail() { +func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail_Conflict() { // get token repositories := handlers.NewRepositories(s.dbConn) authUsecase := auth.NewAuthUseCase(repositories.Auth) @@ -228,3 +247,32 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail() { defer response.Body.Close() s.Require().Equal(http.StatusConflict, response.StatusCode) } + +// CreateUser: Fail case - Username is empty +func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail_ValidateUser() { + // get token + repositories := handlers.NewRepositories(s.dbConn) + authUsecase := auth.NewAuthUseCase(repositories.Auth) + token, err := authUsecase.GenerateToken("firstUser1", "5") + s.Require().NoError(err) + + reqBodyStr := `{ + "username": "", + "password": "123456", + "max_task_per_day": 2 + }` + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/users", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + s.Require().NoError(err) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + + client := http.Client{} + response, err := client.Do(req) + s.Require().NoError(err) + defer response.Body.Close() + s.Require().Equal(http.StatusInternalServerError, response.StatusCode) +} From b11e6669597d0dbf0ab6d7c7fb228deadbb15e07 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 00:24:42 +0700 Subject: [PATCH 23/61] Add test and fix status --- {document => documents}/ERD.svg | 0 {document => documents}/Flow-AddTask.svg | 0 {document => documents}/Flow-CreateUser.svg | 0 {document => documents}/Flow-Login.svg | 0 integrationtest/integrationtest_test.go | 4 +- internal/api/handlers/common/common_test.go | 66 +++++++++++++++++++++ internal/api/handlers/common/var_test.go | 41 +++++++++++++ internal/api/handlers/task/task.go | 2 +- internal/api/handlers/user/user.go | 2 +- 9 files changed, 111 insertions(+), 4 deletions(-) rename {document => documents}/ERD.svg (100%) rename {document => documents}/Flow-AddTask.svg (100%) rename {document => documents}/Flow-CreateUser.svg (100%) rename {document => documents}/Flow-Login.svg (100%) create mode 100644 internal/api/handlers/common/common_test.go create mode 100644 internal/api/handlers/common/var_test.go diff --git a/document/ERD.svg b/documents/ERD.svg similarity index 100% rename from document/ERD.svg rename to documents/ERD.svg diff --git a/document/Flow-AddTask.svg b/documents/Flow-AddTask.svg similarity index 100% rename from document/Flow-AddTask.svg rename to documents/Flow-AddTask.svg diff --git a/document/Flow-CreateUser.svg b/documents/Flow-CreateUser.svg similarity index 100% rename from document/Flow-CreateUser.svg rename to documents/Flow-CreateUser.svg diff --git a/document/Flow-Login.svg b/documents/Flow-Login.svg similarity index 100% rename from document/Flow-Login.svg rename to documents/Flow-Login.svg diff --git a/integrationtest/integrationtest_test.go b/integrationtest/integrationtest_test.go index 4037d2dd0..412839279 100644 --- a/integrationtest/integrationtest_test.go +++ b/integrationtest/integrationtest_test.go @@ -120,7 +120,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { response, err := client.Do(req) s.Require().NoError(err) defer response.Body.Close() - s.Require().Equal(http.StatusOK, response.StatusCode) + s.Require().Equal(http.StatusCreated, response.StatusCode) } // AddTask: Fail case - Wrong userID @@ -200,7 +200,7 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { response, err := client.Do(req) s.Require().NoError(err) defer response.Body.Close() - s.Require().Equal(http.StatusOK, response.StatusCode) + s.Require().Equal(http.StatusCreated, response.StatusCode) byteResBody, err := ioutil.ReadAll(response.Body) s.Require().NoError(err) diff --git a/internal/api/handlers/common/common_test.go b/internal/api/handlers/common/common_test.go new file mode 100644 index 000000000..a5e1df494 --- /dev/null +++ b/internal/api/handlers/common/common_test.go @@ -0,0 +1,66 @@ +package common + +import ( + "bytes" + "encoding/json" + "net/http" + "net/http/httptest" + "regexp" + "testing" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/models" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestLogin(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/login", Login(service)) + + { //Success case + user := models.User{ + Username: "manabie321", + Password: "123456", + } + + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStats(db, user.Username, user.Password) + require.Nil(t, err) + + rows := sqlmock.NewRows([]string{"username"}). + AddRow(user.Username) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1 and password = $2) LIMIT 1`)). + WithArgs(user.Username, user.Password). + WillReturnRows(rows) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("at least 1 expectation was not met: %s", err) + } + + jsonValue, _ := json.Marshal(user) + req, _ := http.NewRequest(http.MethodPost, "/login", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusCreated, w.Code) + } + +} diff --git a/internal/api/handlers/common/var_test.go b/internal/api/handlers/common/var_test.go new file mode 100644 index 000000000..c8fb6519b --- /dev/null +++ b/internal/api/handlers/common/var_test.go @@ -0,0 +1,41 @@ +package common + +import ( + "fmt" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/gin-gonic/gin" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { + sqlDB, mock, err := sqlmock.New() // mock sql.DB + if err != nil { + return nil, nil, errors.Wrap(err, "Fail connection to database") + } + + db, err := gorm.Open("postgres", sqlDB) // open gorm db + if err != nil { + return nil, nil, err + } + + if db == nil { + return nil, nil, errors.New("Fail connection to database") + } + + return db, mock, nil +} + +func SetUpRouter() *gin.Engine { + router := gin.Default() + return router +} + +func recordStats(db *gorm.DB, username, password string) (err error) { + _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) + } + return +} diff --git a/internal/api/handlers/task/task.go b/internal/api/handlers/task/task.go index a96b62b5c..2032368b9 100644 --- a/internal/api/handlers/task/task.go +++ b/internal/api/handlers/task/task.go @@ -60,7 +60,7 @@ func AddTask(service handlers.MainUseCase) gin.HandlerFunc { return } - responses.ResponseForOK(ctx, http.StatusOK, nil, "Success") + responses.ResponseForOK(ctx, http.StatusCreated, nil, "Success") } } diff --git a/internal/api/handlers/user/user.go b/internal/api/handlers/user/user.go index 993e3e899..6fe8ec9ca 100644 --- a/internal/api/handlers/user/user.go +++ b/internal/api/handlers/user/user.go @@ -47,6 +47,6 @@ func CreateUser(service handlers.MainUseCase) gin.HandlerFunc { return } - responses.ResponseForOK(ctx, http.StatusOK, inputUser, "Success") + responses.ResponseForOK(ctx, http.StatusCreated, inputUser, "Success") } } From b273f1679cb662241471cc7464d42c01207e423b Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 00:49:31 +0700 Subject: [PATCH 24/61] Update README --- Makefile | 3 +-- README.md | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8178fc104..b282a7b3c 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,7 @@ test-migration: @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up integration-test: - cd cmd && go run main.go - cd .. && go test ./integrationtest + go test ./integrationtest nodemon: nodemon --exec go run cmd/main.go --signal SIGTERM diff --git a/README.md b/README.md index 2133ddfe9..b1ad33667 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,28 @@ The repository have a few main features ```bash git clone https://github.com/DuongThanhTin/togo.git ``` -2. Run main.go + +2. Create Database postgres with your config + +3. Go to folder project + +4. Change data variable in file .env with your config + +5. Migration database with terminal +```bash +make migration-up +``` +6. Run main.go ```bash -cd togo go run cmd/main.go ``` + +7. If you want to integration test after run projection +```bash +make integration-test +``` + +8. If you want to remove table database +```bash +make migration-down +``` \ No newline at end of file From 22441126f9a58deb1f85e0cb0a5f5cbf751158a9 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 01:02:57 +0700 Subject: [PATCH 25/61] Change auth to authorzation --- internal/api/handlers/common/common_test.go | 6 +- internal/api/handlers/handlers.go | 4 +- internal/api/handlers/task/task_test.go | 22 +-- internal/repositories/auth/auth_test.go | 125 ------------------ internal/repositories/auth/var_test.go | 35 ----- .../{auth => authorization}/CHANGELOG.md | 0 .../authorization.go} | 6 +- .../authorization/authorization_test.go | 40 ++++++ .../{auth => authorization}/CHANGELOG.md | 0 .../authorization.go} | 2 +- .../{auth => authorization}/interface.go | 2 +- 11 files changed, 51 insertions(+), 191 deletions(-) delete mode 100644 internal/repositories/auth/auth_test.go delete mode 100644 internal/repositories/auth/var_test.go rename internal/repositories/{auth => authorization}/CHANGELOG.md (100%) rename internal/repositories/{auth/auth.go => authorization/authorization.go} (90%) create mode 100644 internal/repositories/authorization/authorization_test.go rename internal/usecases/{auth => authorization}/CHANGELOG.md (100%) rename internal/usecases/{auth/auth.go => authorization/authorization.go} (97%) rename internal/usecases/{auth => authorization}/interface.go (88%) diff --git a/internal/api/handlers/common/common_test.go b/internal/api/handlers/common/common_test.go index a5e1df494..d5dc9b319 100644 --- a/internal/api/handlers/common/common_test.go +++ b/internal/api/handlers/common/common_test.go @@ -32,7 +32,7 @@ func TestLogin(t *testing.T) { { //Success case user := models.User{ - Username: "manabie321", + Username: "manabie-test-2", Password: "123456", } @@ -45,8 +45,8 @@ func TestLogin(t *testing.T) { err := recordStats(db, user.Username, user.Password) require.Nil(t, err) - rows := sqlmock.NewRows([]string{"username"}). - AddRow(user.Username) + rows := sqlmock.NewRows([]string{"id", "username", "password", "max_task_per_day"}). + AddRow("1", user.Username, user.Password, 5) mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1 and password = $2) LIMIT 1`)). WithArgs(user.Username, user.Password). diff --git a/internal/api/handlers/handlers.go b/internal/api/handlers/handlers.go index 3ef84a92c..4e81bcb44 100644 --- a/internal/api/handlers/handlers.go +++ b/internal/api/handlers/handlers.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/manabie-com/togo/constants" - authRepo "github.com/manabie-com/togo/internal/repositories/auth" + authRepo "github.com/manabie-com/togo/internal/repositories/authorization" taskRepo "github.com/manabie-com/togo/internal/repositories/task" userRepo "github.com/manabie-com/togo/internal/repositories/user" "github.com/manabie-com/togo/utils" - authService "github.com/manabie-com/togo/internal/usecases/auth" + authService "github.com/manabie-com/togo/internal/usecases/authorization" taskService "github.com/manabie-com/togo/internal/usecases/task" userService "github.com/manabie-com/togo/internal/usecases/user" diff --git a/internal/api/handlers/task/task_test.go b/internal/api/handlers/task/task_test.go index f630b247f..51ed34c0f 100644 --- a/internal/api/handlers/task/task_test.go +++ b/internal/api/handlers/task/task_test.go @@ -1,29 +1,9 @@ package task import ( - "reflect" "testing" - - "github.com/gin-gonic/gin" - "github.com/manabie-com/togo/internal/api/handlers" ) func TestAddTask(t *testing.T) { - type args struct { - service handlers.MainUseCase - } - tests := []struct { - name string - args args - want gin.HandlerFunc - }{ - // TODO: Add test cases. - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - if got := AddTask(tt.args.service); !reflect.DeepEqual(got, tt.want) { - t.Errorf("AddTask() = %v, want %v", got, tt.want) - } - }) - } + } diff --git a/internal/repositories/auth/auth_test.go b/internal/repositories/auth/auth_test.go deleted file mode 100644 index efb7585ae..000000000 --- a/internal/repositories/auth/auth_test.go +++ /dev/null @@ -1,125 +0,0 @@ -package auth - -import ( - "fmt" - "regexp" - "testing" - - "github.com/DATA-DOG/go-sqlmock" - "github.com/manabie-com/togo/utils" - "github.com/stretchr/testify/require" -) - -func Test_repository_ValidateUser(t *testing.T) { - t.Parallel() - db, mock, err := setupMock() - if err != nil { - t.Fatalf("an error '%s' was not expected when opening stub database connection", err) - } - require.Nil(t, err) - require.NotNil(t, mock) - require.NotNil(t, db) - - defer db.Close() - - type userValidate struct { - Username string - Password string - Expect bool - } - - authRepository := NewAuthRepository(db) - - { //Success case - user := userValidate{ - Username: "manabie321", - Password: "123456", - Expect: true, - } - - // Create mock data for test - mock.ExpectExec("INSERT INTO users"). - WithArgs(1, user.Username, user.Password, 5). - WillReturnResult(sqlmock.NewResult(1, 1)) - - // Create Data - err := recordStats(db, user.Username, user.Password) - require.Nil(t, err) - - rows := sqlmock.NewRows([]string{"id", "username", "password", "max_task_per_day"}). - AddRow("1", user.Username, user.Password, 5) - mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). - WithArgs(user.Username). - WillReturnRows(rows) - - actual, err := authRepository.ValidateUser(user.Username) - require.Nil(t, err) - require.Equal(t, user.Expect, actual) - - if err := mock.ExpectationsWereMet(); err != nil { - t.Errorf("at least 1 expectation was not met: %s", err) - } - } - { // Success case: Not have user - user := userValidate{ - Username: "fail_name", - Password: "fail_pass", - Expect: false, - } - - mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). - WithArgs(user.Username). - WillReturnError(fmt.Errorf("invalid user")) - - actual, _ := authRepository.ValidateUser(user.Username) - require.Equal(t, user.Expect, actual) - - if err := mock.ExpectationsWereMet(); err != nil { - t.Errorf("at least 1 expectation was not met: %s", err) - } - } -} - -func Test_repository_GenerateToken(t *testing.T) { - t.Parallel() - //Load Env - utils.LoadEnv("../../../.env") - - db, mock, err := setupMock() - if err != nil { - t.Fatalf("an error '%s' was not expected when opening stub database connection", err) - } - require.Nil(t, err) - require.NotNil(t, mock) - require.NotNil(t, db) - - type args struct { - userID string - maxTaskPerday string - } - - authRepository := NewAuthRepository(db) - { // Success case - input := args{ - userID: "1", - maxTaskPerday: "5", - } - tokenStr, err := authRepository.GenerateToken(input.userID, input.maxTaskPerday) - require.Nil(t, err) - require.NotNil(t, tokenStr) - - require.NotEqual(t, "", utils.SafeString(tokenStr)) - } - - { // Fail case - input := args{ - userID: "", - maxTaskPerday: "", - } - tokenStr, err := authRepository.GenerateToken(input.userID, input.maxTaskPerday) - require.NotNil(t, err) - require.Nil(t, tokenStr) - - require.Equal(t, "", utils.SafeString(tokenStr)) - } -} diff --git a/internal/repositories/auth/var_test.go b/internal/repositories/auth/var_test.go deleted file mode 100644 index a6c1210cb..000000000 --- a/internal/repositories/auth/var_test.go +++ /dev/null @@ -1,35 +0,0 @@ -package auth - -import ( - "fmt" - - "github.com/DATA-DOG/go-sqlmock" - "github.com/jinzhu/gorm" - "github.com/pkg/errors" -) - -func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { - sqlDB, mock, err := sqlmock.New() // mock sql.DB - if err != nil { - return nil, nil, errors.Wrap(err, "Fail connection to database") - } - - db, err := gorm.Open("postgres", sqlDB) // open gorm db - if err != nil { - return nil, nil, err - } - - if db == nil { - return nil, nil, errors.New("Fail connection to database") - } - - return db, mock, nil -} - -func recordStats(db *gorm.DB, username, password string) (err error) { - _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) - if err != nil { - return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) - } - return -} diff --git a/internal/repositories/auth/CHANGELOG.md b/internal/repositories/authorization/CHANGELOG.md similarity index 100% rename from internal/repositories/auth/CHANGELOG.md rename to internal/repositories/authorization/CHANGELOG.md diff --git a/internal/repositories/auth/auth.go b/internal/repositories/authorization/authorization.go similarity index 90% rename from internal/repositories/auth/auth.go rename to internal/repositories/authorization/authorization.go index 068bfbe31..0d6d3a150 100644 --- a/internal/repositories/auth/auth.go +++ b/internal/repositories/authorization/authorization.go @@ -1,4 +1,4 @@ -package auth +package authorization import ( "os" @@ -6,7 +6,7 @@ import ( "time" "github.com/manabie-com/togo/internal/models" - "github.com/manabie-com/togo/internal/usecases/auth" + "github.com/manabie-com/togo/internal/usecases/authorization" "github.com/manabie-com/togo/utils" "github.com/dgrijalva/jwt-go" @@ -18,7 +18,7 @@ type repository struct { DB *gorm.DB } -func NewAuthRepository(db *gorm.DB) auth.AuthRepository { +func NewAuthRepository(db *gorm.DB) authorization.AuthRepository { return &repository{ DB: db, } diff --git a/internal/repositories/authorization/authorization_test.go b/internal/repositories/authorization/authorization_test.go new file mode 100644 index 000000000..3bc80b1bc --- /dev/null +++ b/internal/repositories/authorization/authorization_test.go @@ -0,0 +1,40 @@ +package authorization + +import ( + "testing" + + "github.com/jinzhu/gorm" +) + +func Test_repository_ValidateUser(t *testing.T) { + type fields struct { + DB *gorm.DB + } + type args struct { + username string + } + tests := []struct { + name string + fields fields + args args + want bool + wantErr bool + }{ + // TODO: Add test cases. + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + r := &repository{ + DB: tt.fields.DB, + } + got, err := r.ValidateUser(tt.args.username) + if (err != nil) != tt.wantErr { + t.Errorf("repository.ValidateUser() error = %v, wantErr %v", err, tt.wantErr) + return + } + if got != tt.want { + t.Errorf("repository.ValidateUser() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/internal/usecases/auth/CHANGELOG.md b/internal/usecases/authorization/CHANGELOG.md similarity index 100% rename from internal/usecases/auth/CHANGELOG.md rename to internal/usecases/authorization/CHANGELOG.md diff --git a/internal/usecases/auth/auth.go b/internal/usecases/authorization/authorization.go similarity index 97% rename from internal/usecases/auth/auth.go rename to internal/usecases/authorization/authorization.go index cfe716f40..7db5d9077 100644 --- a/internal/usecases/auth/auth.go +++ b/internal/usecases/authorization/authorization.go @@ -1,4 +1,4 @@ -package auth +package authorization // AuthUsecase is the definition for collection of methods related to the `auths` table use case type AuthUseCase interface { diff --git a/internal/usecases/auth/interface.go b/internal/usecases/authorization/interface.go similarity index 88% rename from internal/usecases/auth/interface.go rename to internal/usecases/authorization/interface.go index b00c53a3c..b779fa78b 100644 --- a/internal/usecases/auth/interface.go +++ b/internal/usecases/authorization/interface.go @@ -1,4 +1,4 @@ -package auth +package authorization type Common interface { ValidateUser(username string) (bool, error) From 5f48211b6c2ca82429d7cf26abe6c354c6e33729 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 07:09:56 +0700 Subject: [PATCH 26/61] Change name variable --- Makefile | 3 +++ integrationtest/integrationtest_test.go | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b282a7b3c..36f18a2e1 100644 --- a/Makefile +++ b/Makefile @@ -19,5 +19,8 @@ test-migration: integration-test: go test ./integrationtest +test: + go test ./... + nodemon: nodemon --exec go run cmd/main.go --signal SIGTERM diff --git a/integrationtest/integrationtest_test.go b/integrationtest/integrationtest_test.go index 412839279..5f0afdbb7 100644 --- a/integrationtest/integrationtest_test.go +++ b/integrationtest/integrationtest_test.go @@ -13,7 +13,7 @@ import ( "github.com/manabie-com/togo/constants" "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/models" - "github.com/manabie-com/togo/internal/usecases/auth" + "github.com/manabie-com/togo/internal/usecases/authorization" "github.com/manabie-com/togo/utils" "github.com/jinzhu/gorm" @@ -96,8 +96,8 @@ func (s *IntegrationTestSuite) TestIntegration_Login_Fail_Validate() { func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { // get token repositories := handlers.NewRepositories(s.dbConn) - authUsecase := auth.NewAuthUseCase(repositories.Auth) - token, err := authUsecase.GenerateToken("firstUser", "5") + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + token, err := authUsecase.GenerateToken("firstUser", "10") s.Require().NoError(err) reqBodyStr := `{ @@ -127,7 +127,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskSuccess() { func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { // get token repositories := handlers.NewRepositories(s.dbConn) - authUsecase := auth.NewAuthUseCase(repositories.Auth) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) token, err := authUsecase.GenerateToken("firstUser1", "5") s.Require().NoError(err) @@ -158,7 +158,7 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail() { func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_ValidateMaxTaskPerDay() { // get token repositories := handlers.NewRepositories(s.dbConn) - authUsecase := auth.NewAuthUseCase(repositories.Auth) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) token, err := authUsecase.GenerateToken("secondUser", "0") s.Require().NoError(err) @@ -223,7 +223,7 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail_Conflict() { // get token repositories := handlers.NewRepositories(s.dbConn) - authUsecase := auth.NewAuthUseCase(repositories.Auth) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) token, err := authUsecase.GenerateToken("firstUser1", "5") s.Require().NoError(err) @@ -252,7 +252,7 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail_Conflict() { func (s *IntegrationTestSuite) TestIntegration_CreateUser_Fail_ValidateUser() { // get token repositories := handlers.NewRepositories(s.dbConn) - authUsecase := auth.NewAuthUseCase(repositories.Auth) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) token, err := authUsecase.GenerateToken("firstUser1", "5") s.Require().NoError(err) From 6f08937e448a35c394159435f39a30c8e6e17924 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 08:13:18 +0700 Subject: [PATCH 27/61] Add unit test in handler --- go.mod | 25 ++++--- go.sum | 22 ++++-- internal/api/handlers/common/common.go | 5 +- internal/api/handlers/common/common_test.go | 8 +- internal/api/handlers/task/task_test.go | 83 +++++++++++++++++++++ internal/api/handlers/task/var_test.go | 41 ++++++++++ internal/api/handlers/user/user.go | 3 +- internal/api/handlers/user/user_test.go | 1 - 8 files changed, 159 insertions(+), 29 deletions(-) create mode 100644 internal/api/handlers/task/var_test.go diff --git a/go.mod b/go.mod index 5a2bb4ace..35f793c17 100644 --- a/go.mod +++ b/go.mod @@ -3,32 +3,33 @@ module github.com/manabie-com/togo go 1.17 require ( - github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect - github.com/caarlos0/env v3.5.0+incompatible // indirect + github.com/DATA-DOG/go-sqlmock v1.5.0 + github.com/caarlos0/env v3.5.0+incompatible + github.com/dgrijalva/jwt-go v3.2.0+incompatible + github.com/gin-gonic/gin v1.8.1 + github.com/google/uuid v1.3.0 + github.com/jinzhu/gorm v1.9.16 + github.com/joho/godotenv v1.4.0 + github.com/lib/pq v1.1.1 + github.com/pkg/errors v0.9.1 + github.com/stretchr/testify v1.7.5 +) + +require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/gin-gonic/gin v1.8.1 // indirect - github.com/go-chi/chi/v5 v5.0.7 github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-json v0.9.7 // indirect - github.com/golang-migrate/migrate v3.5.4+incompatible - github.com/google/uuid v1.3.0 // indirect - github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect - github.com/joho/godotenv v1.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect - github.com/lib/pq v1.1.1 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.1 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/testify v1.7.5 // indirect github.com/ugorji/go/codec v1.2.7 // indirect golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect diff --git a/go.sum b/go.sum index cf74e15d2..f440d3643 100644 --- a/go.sum +++ b/go.sum @@ -8,16 +8,17 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= -github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= -github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= @@ -25,13 +26,14 @@ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/j github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0= github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA= -github.com/golang-migrate/migrate v3.5.4+incompatible/go.mod h1:IsVUlFN5puWOmXrqjgGUfIRIbU7mr8oNBE2tyERd9Wk= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -40,6 +42,7 @@ github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= 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.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= @@ -47,9 +50,11 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= @@ -57,6 +62,7 @@ github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -70,18 +76,17 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= @@ -98,7 +103,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxW golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -111,12 +115,14 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/internal/api/handlers/common/common.go b/internal/api/handlers/common/common.go index 6c00ba909..dd0b17b43 100644 --- a/internal/api/handlers/common/common.go +++ b/internal/api/handlers/common/common.go @@ -1,6 +1,7 @@ package common import ( + "encoding/json" "fmt" "net/http" "strconv" @@ -31,6 +32,8 @@ func Login(service handlers.MainUseCase) gin.HandlerFunc { responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail Login") return } + test, _ := json.Marshal(user) + fmt.Println("test ", string(test)) if user == nil { responses.ResponseForError(ctx, nil, http.StatusBadRequest, "Fail Login") @@ -51,7 +54,7 @@ func Login(service handlers.MainUseCase) gin.HandlerFunc { } //Set Cookie - ctx.SetCookie(constants.CookieTokenKey, utils.SafeString(token), 60*60*24, "/", fmt.Sprintf("%s:%s", utils.Env.DBHost, utils.Env.DBPort), true, true) + ctx.SetCookie(constants.CookieTokenKey, utils.SafeString(token), 60*60*24, "/", utils.Env.Host, true, true) responses.ResponseForOK(ctx, http.StatusOK, nil, "Success") } diff --git a/internal/api/handlers/common/common_test.go b/internal/api/handlers/common/common_test.go index d5dc9b319..443716ed9 100644 --- a/internal/api/handlers/common/common_test.go +++ b/internal/api/handlers/common/common_test.go @@ -11,6 +11,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -26,6 +27,7 @@ func TestLogin(t *testing.T) { require.NotNil(t, db) defer db.Close() + utils.LoadEnv("../../../../.env") r := SetUpRouter() service := handlers.HandleService(db) r.POST("/login", Login(service)) @@ -52,15 +54,11 @@ func TestLogin(t *testing.T) { WithArgs(user.Username, user.Password). WillReturnRows(rows) - if err := mock.ExpectationsWereMet(); err != nil { - t.Errorf("at least 1 expectation was not met: %s", err) - } - jsonValue, _ := json.Marshal(user) req, _ := http.NewRequest(http.MethodPost, "/login", bytes.NewBuffer(jsonValue)) w := httptest.NewRecorder() r.ServeHTTP(w, req) - assert.Equal(t, http.StatusCreated, w.Code) + assert.Equal(t, http.StatusOK, w.Code) } } diff --git a/internal/api/handlers/task/task_test.go b/internal/api/handlers/task/task_test.go index 51ed34c0f..7b4f5f9d2 100644 --- a/internal/api/handlers/task/task_test.go +++ b/internal/api/handlers/task/task_test.go @@ -1,9 +1,92 @@ package task import ( + "bytes" + "encoding/json" + "net/http" + "net/http/httptest" + "regexp" "testing" + "time" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/manabie-com/togo/constants" + "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/internal/repositories/task" + "github.com/manabie-com/togo/internal/usecases/authorization" + "github.com/manabie-com/togo/utils" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestAddTask(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/tasks", AddTask(service)) + + //Generate token + repositories := handlers.NewRepositories(db) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + + { //Success case + // Create mock data User for test + user := models.User{ + Username: "manabie-test-2", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := task.NewTask(models.Task{ + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "1", + }) + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + + //Generate token + token, err := authUsecase.GenerateToken(input.UserID, "10") + require.Nil(t, err) + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusCreated, w.Code) + } } diff --git a/internal/api/handlers/task/var_test.go b/internal/api/handlers/task/var_test.go new file mode 100644 index 000000000..1e75919ea --- /dev/null +++ b/internal/api/handlers/task/var_test.go @@ -0,0 +1,41 @@ +package task + +import ( + "fmt" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/gin-gonic/gin" + "github.com/jinzhu/gorm" + "github.com/pkg/errors" +) + +func setupMock() (*gorm.DB, sqlmock.Sqlmock, error) { + sqlDB, mock, err := sqlmock.New() // mock sql.DB + if err != nil { + return nil, nil, errors.Wrap(err, "Fail connection to database") + } + + db, err := gorm.Open("postgres", sqlDB) // open gorm db + if err != nil { + return nil, nil, err + } + + if db == nil { + return nil, nil, errors.New("Fail connection to database") + } + + return db, mock, nil +} + +func SetUpRouter() *gin.Engine { + router := gin.Default() + return router +} + +func recordStatsUser(db *gorm.DB, username, password string) (err error) { + _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) + } + return +} diff --git a/internal/api/handlers/user/user.go b/internal/api/handlers/user/user.go index 6fe8ec9ca..f0faf8f13 100644 --- a/internal/api/handlers/user/user.go +++ b/internal/api/handlers/user/user.go @@ -3,12 +3,11 @@ package user import ( "net/http" + "github.com/gin-gonic/gin" "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/models" "github.com/manabie-com/togo/internal/pkg/responses" "github.com/manabie-com/togo/internal/repositories/user" - - "github.com/gin-gonic/gin" ) type Input struct { diff --git a/internal/api/handlers/user/user_test.go b/internal/api/handlers/user/user_test.go index 7134a832d..6c62a6983 100644 --- a/internal/api/handlers/user/user_test.go +++ b/internal/api/handlers/user/user_test.go @@ -11,7 +11,6 @@ import ( "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/models" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) From 2acbdec8390bd52be2727ea66286f19006a5b405 Mon Sep 17 00:00:00 2001 From: DuongThanhTin Date: Mon, 27 Jun 2022 08:17:11 +0700 Subject: [PATCH 28/61] Change name folder in api --- README.md | 12 ++++++------ internal/api/handlers/{task => tasks}/CHANGELOG.md | 0 internal/api/handlers/{task => tasks}/api.go | 2 +- internal/api/handlers/{task => tasks}/task.go | 2 +- internal/api/handlers/{task => tasks}/task_test.go | 2 +- internal/api/handlers/{task => tasks}/var_test.go | 2 +- internal/api/handlers/{user => users}/CHANGELOG.md | 0 internal/api/handlers/{user => users}/api.go | 2 +- internal/api/handlers/{user => users}/user.go | 2 +- internal/api/handlers/{user => users}/user_test.go | 2 +- internal/api/handlers/{user => users}/var_test.go | 2 +- internal/api/routes/routes.go | 8 ++++---- 12 files changed, 18 insertions(+), 18 deletions(-) rename internal/api/handlers/{task => tasks}/CHANGELOG.md (100%) rename internal/api/handlers/{task => tasks}/api.go (95%) rename internal/api/handlers/{task => tasks}/task.go (99%) rename internal/api/handlers/{task => tasks}/task_test.go (99%) rename internal/api/handlers/{task => tasks}/var_test.go (98%) rename internal/api/handlers/{user => users}/CHANGELOG.md (100%) rename internal/api/handlers/{user => users}/api.go (94%) rename internal/api/handlers/{user => users}/user.go (99%) rename internal/api/handlers/{user => users}/user_test.go (99%) rename internal/api/handlers/{user => users}/var_test.go (98%) diff --git a/README.md b/README.md index b1ad33667..b059ebf1b 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ The repository have a few main features |- api --> You can create different output commands like Api rest, web, GRPC or any other technology. |- handlers --> Contain API |- common --> API for common - |- task --> API for task - |- user --> API for user + |- tasks --> API for task + |- users --> API for user |- routes --> Make create route for API |- driver --> Config connection to database |- models --> Application models @@ -49,13 +49,13 @@ The repository have a few main features |- id --> Make create uuid |- responses --> Make create many response data |- repositories --> Repositoryies will action to database (CRUD) - |- auth --> Repository for auth + |- authorization --> Repository for auth |- task --> Repository for task |- user --> Repository for user |- usecases --> Usecases to implement action for application - |- auth --> Usecase for auth - |- task --> Usecase for task - |- user --> Usecase for user + |- authorization --> Usecase for auth + |- task --> Usecase for task + |- user --> Usecase for user ``` ### How to start diff --git a/internal/api/handlers/task/CHANGELOG.md b/internal/api/handlers/tasks/CHANGELOG.md similarity index 100% rename from internal/api/handlers/task/CHANGELOG.md rename to internal/api/handlers/tasks/CHANGELOG.md diff --git a/internal/api/handlers/task/api.go b/internal/api/handlers/tasks/api.go similarity index 95% rename from internal/api/handlers/task/api.go rename to internal/api/handlers/tasks/api.go index 402002f36..f8acc768c 100644 --- a/internal/api/handlers/task/api.go +++ b/internal/api/handlers/tasks/api.go @@ -1,4 +1,4 @@ -package task +package tasks import ( "github.com/manabie-com/togo/cmd/middlewares" diff --git a/internal/api/handlers/task/task.go b/internal/api/handlers/tasks/task.go similarity index 99% rename from internal/api/handlers/task/task.go rename to internal/api/handlers/tasks/task.go index 2032368b9..488b82ea6 100644 --- a/internal/api/handlers/task/task.go +++ b/internal/api/handlers/tasks/task.go @@ -1,4 +1,4 @@ -package task +package tasks import ( "net/http" diff --git a/internal/api/handlers/task/task_test.go b/internal/api/handlers/tasks/task_test.go similarity index 99% rename from internal/api/handlers/task/task_test.go rename to internal/api/handlers/tasks/task_test.go index 7b4f5f9d2..c064edf8b 100644 --- a/internal/api/handlers/task/task_test.go +++ b/internal/api/handlers/tasks/task_test.go @@ -1,4 +1,4 @@ -package task +package tasks import ( "bytes" diff --git a/internal/api/handlers/task/var_test.go b/internal/api/handlers/tasks/var_test.go similarity index 98% rename from internal/api/handlers/task/var_test.go rename to internal/api/handlers/tasks/var_test.go index 1e75919ea..7c4a69406 100644 --- a/internal/api/handlers/task/var_test.go +++ b/internal/api/handlers/tasks/var_test.go @@ -1,4 +1,4 @@ -package task +package tasks import ( "fmt" diff --git a/internal/api/handlers/user/CHANGELOG.md b/internal/api/handlers/users/CHANGELOG.md similarity index 100% rename from internal/api/handlers/user/CHANGELOG.md rename to internal/api/handlers/users/CHANGELOG.md diff --git a/internal/api/handlers/user/api.go b/internal/api/handlers/users/api.go similarity index 94% rename from internal/api/handlers/user/api.go rename to internal/api/handlers/users/api.go index b19e0a842..9f796b1bd 100644 --- a/internal/api/handlers/user/api.go +++ b/internal/api/handlers/users/api.go @@ -1,4 +1,4 @@ -package user +package users import ( "github.com/manabie-com/togo/internal/api/handlers" diff --git a/internal/api/handlers/user/user.go b/internal/api/handlers/users/user.go similarity index 99% rename from internal/api/handlers/user/user.go rename to internal/api/handlers/users/user.go index f0faf8f13..541ec6f58 100644 --- a/internal/api/handlers/user/user.go +++ b/internal/api/handlers/users/user.go @@ -1,4 +1,4 @@ -package user +package users import ( "net/http" diff --git a/internal/api/handlers/user/user_test.go b/internal/api/handlers/users/user_test.go similarity index 99% rename from internal/api/handlers/user/user_test.go rename to internal/api/handlers/users/user_test.go index 6c62a6983..2d8f8ac13 100644 --- a/internal/api/handlers/user/user_test.go +++ b/internal/api/handlers/users/user_test.go @@ -1,4 +1,4 @@ -package user +package users import ( "bytes" diff --git a/internal/api/handlers/user/var_test.go b/internal/api/handlers/users/var_test.go similarity index 98% rename from internal/api/handlers/user/var_test.go rename to internal/api/handlers/users/var_test.go index b6af97ed9..00aea5d6a 100644 --- a/internal/api/handlers/user/var_test.go +++ b/internal/api/handlers/users/var_test.go @@ -1,4 +1,4 @@ -package user +package users import ( "github.com/DATA-DOG/go-sqlmock" diff --git a/internal/api/routes/routes.go b/internal/api/routes/routes.go index 491f05107..63758a593 100644 --- a/internal/api/routes/routes.go +++ b/internal/api/routes/routes.go @@ -3,14 +3,14 @@ package routes import ( "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/api/handlers/common" - "github.com/manabie-com/togo/internal/api/handlers/task" - "github.com/manabie-com/togo/internal/api/handlers/user" + "github.com/manabie-com/togo/internal/api/handlers/tasks" + "github.com/manabie-com/togo/internal/api/handlers/users" "github.com/gin-gonic/gin" ) func SetupRoute(router *gin.Engine, service handlers.MainUseCase) { common.NewHandler(router, service) - user.NewHandler(router, service) - task.NewHandler(router, service) + users.NewHandler(router, service) + tasks.NewHandler(router, service) } From 1557cdb5b1c3fab3f58fc3c2d6725bdf989d59cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 12:38:44 +0700 Subject: [PATCH 29/61] Add unit test in handler --- internal/api/handlers/common/CHANGELOG.md | 1 + internal/api/handlers/tasks/CHANGELOG.md | 1 + internal/api/handlers/tasks/task_test.go | 55 +++++++++++++++++++++-- internal/api/handlers/users/CHANGELOG.md | 1 + internal/api/handlers/users/user_test.go | 23 ++++++++++ 5 files changed, 78 insertions(+), 3 deletions(-) diff --git a/internal/api/handlers/common/CHANGELOG.md b/internal/api/handlers/common/CHANGELOG.md index ab4fa67d3..977bfb5e9 100644 --- a/internal/api/handlers/common/CHANGELOG.md +++ b/internal/api/handlers/common/CHANGELOG.md @@ -7,5 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Add unit test - Make create `router` - Handle func common diff --git a/internal/api/handlers/tasks/CHANGELOG.md b/internal/api/handlers/tasks/CHANGELOG.md index 5959dbcae..8c2f61d75 100644 --- a/internal/api/handlers/tasks/CHANGELOG.md +++ b/internal/api/handlers/tasks/CHANGELOG.md @@ -7,5 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Add unit test - Make create `router` - Handle func `Validate` and api `FindTaskByUser` diff --git a/internal/api/handlers/tasks/task_test.go b/internal/api/handlers/tasks/task_test.go index c064edf8b..ce156bb6b 100644 --- a/internal/api/handlers/tasks/task_test.go +++ b/internal/api/handlers/tasks/task_test.go @@ -13,7 +13,6 @@ import ( "github.com/manabie-com/togo/constants" "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/models" - "github.com/manabie-com/togo/internal/repositories/task" "github.com/manabie-com/togo/internal/usecases/authorization" "github.com/manabie-com/togo/utils" "github.com/stretchr/testify/assert" @@ -54,11 +53,11 @@ func TestAddTask(t *testing.T) { err := recordStatsUser(db, user.Username, user.Password) require.Nil(t, err) - input := task.NewTask(models.Task{ + input := models.Task{ Content: "Test Interview", CreateDate: time.Now().Format("2006-01-02"), UserID: "1", - }) + } rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). AddRow("1", input.Content, input.CreateDate, 1) @@ -89,4 +88,54 @@ func TestAddTask(t *testing.T) { r.ServeHTTP(w, req) assert.Equal(t, http.StatusCreated, w.Code) } + + { //Fail case + // Create mock data User for test + user := models.User{ + Username: "manabie-test-3", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := models.Task{ + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "1", + } + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + + //Generate token + token, err := authUsecase.GenerateToken(input.UserID, "0") + require.Nil(t, err) + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusInternalServerError, w.Code) + } } diff --git a/internal/api/handlers/users/CHANGELOG.md b/internal/api/handlers/users/CHANGELOG.md index fd7791f0b..7e6a78b52 100644 --- a/internal/api/handlers/users/CHANGELOG.md +++ b/internal/api/handlers/users/CHANGELOG.md @@ -7,5 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Add unit test - Make create `router` - Handle api `Create` diff --git a/internal/api/handlers/users/user_test.go b/internal/api/handlers/users/user_test.go index 2d8f8ac13..b1043f042 100644 --- a/internal/api/handlers/users/user_test.go +++ b/internal/api/handlers/users/user_test.go @@ -53,6 +53,29 @@ func TestCreateUser(t *testing.T) { w := httptest.NewRecorder() r.ServeHTTP(w, req) assert.Equal(t, http.StatusCreated, w.Code) + } + { //Fail case + input := &models.User{ + ID: "2", + Username: "", + Password: "123456", + MaxTaskPerDay: 5, + } + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnError(fmt.Errorf("")) + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) + mock.ExpectCommit() + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusInternalServerError, w.Code) } } From 55e3f938355ae3367288e3b690715b76610b9d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 12:57:11 +0700 Subject: [PATCH 30/61] change to pointer --- internal/api/handlers/tasks/task_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/handlers/tasks/task_test.go b/internal/api/handlers/tasks/task_test.go index ce156bb6b..59c220e76 100644 --- a/internal/api/handlers/tasks/task_test.go +++ b/internal/api/handlers/tasks/task_test.go @@ -53,7 +53,7 @@ func TestAddTask(t *testing.T) { err := recordStatsUser(db, user.Username, user.Password) require.Nil(t, err) - input := models.Task{ + input := &models.Task{ Content: "Test Interview", CreateDate: time.Now().Format("2006-01-02"), UserID: "1", From c71b07b6f2167d1c845dd83497563d25581cc341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 19:14:17 +0700 Subject: [PATCH 31/61] Remove unused --- Makefile | 8 ++-- internal/api/handlers/tasks/task_test.go | 50 ------------------------ internal/api/handlers/users/user_test.go | 24 ------------ 3 files changed, 4 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 36f18a2e1..cd12576a9 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,11 @@ test-migration: @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up -integration-test: - go test ./integrationtest - -test: +test-all: go test ./... +integration-test: + go test ./integrationtest + nodemon: nodemon --exec go run cmd/main.go --signal SIGTERM diff --git a/internal/api/handlers/tasks/task_test.go b/internal/api/handlers/tasks/task_test.go index 59c220e76..6fd2213f3 100644 --- a/internal/api/handlers/tasks/task_test.go +++ b/internal/api/handlers/tasks/task_test.go @@ -39,56 +39,6 @@ func TestAddTask(t *testing.T) { repositories := handlers.NewRepositories(db) authUsecase := authorization.NewAuthUseCase(repositories.Auth) - { //Success case - // Create mock data User for test - user := models.User{ - Username: "manabie-test-2", - Password: "123456", - } - mock.ExpectExec("INSERT INTO users"). - WithArgs(1, user.Username, user.Password, 5). - WillReturnResult(sqlmock.NewResult(1, 1)) - - // Create Data - err := recordStatsUser(db, user.Username, user.Password) - require.Nil(t, err) - - input := &models.Task{ - Content: "Test Interview", - CreateDate: time.Now().Format("2006-01-02"), - UserID: "1", - } - - rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). - AddRow("1", input.Content, input.CreateDate, 1) - - mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). - WithArgs(input.UserID, input.CreateDate). - WillReturnRows(rows) - - mock.ExpectBegin() - mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). - WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). - WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) - mock.ExpectCommit() - - //Generate token - token, err := authUsecase.GenerateToken(input.UserID, "10") - require.Nil(t, err) - - jsonValue, _ := json.Marshal(input) - req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) - cookie := &http.Cookie{ - Name: constants.CookieTokenKey, - Value: utils.SafeString(token), - MaxAge: 300, - } - req.AddCookie(cookie) - w := httptest.NewRecorder() - r.ServeHTTP(w, req) - assert.Equal(t, http.StatusCreated, w.Code) - } - { //Fail case // Create mock data User for test user := models.User{ diff --git a/internal/api/handlers/users/user_test.go b/internal/api/handlers/users/user_test.go index b1043f042..cb17eb710 100644 --- a/internal/api/handlers/users/user_test.go +++ b/internal/api/handlers/users/user_test.go @@ -30,30 +30,6 @@ func TestCreateUser(t *testing.T) { service := handlers.HandleService(db) r.POST("/users", CreateUser(service)) - { //Success case - input := &models.User{ - ID: "1", - Username: "Manabie-1", - Password: "123456", - MaxTaskPerDay: 5, - } - - mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). - WithArgs(input.Username). - WillReturnError(fmt.Errorf("")) - - // Create mock data for test - mock.ExpectBegin() - mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users"`)). - WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) - mock.ExpectCommit() - - jsonValue, _ := json.Marshal(input) - req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) - w := httptest.NewRecorder() - r.ServeHTTP(w, req) - assert.Equal(t, http.StatusCreated, w.Code) - } { //Fail case input := &models.User{ ID: "2", From 22f191e485d4a9f6996fe67734228350c58c2eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 22:39:41 +0700 Subject: [PATCH 32/61] Add datajson and add more test --- Makefile | 14 +- README.md | 11 +- coverage.log | 21 + datajson/CHANGELOG.md | 10 + datajson/login.json | 4 + datajson/task.json | 3 + datajson/user.json | 4 + internal/api/handlers/common/common.go | 4 - internal/api/handlers/common/common_test.go | 25 ++ .../handlers/common/{var_test.go => setup.go} | 0 internal/api/handlers/common/setup_test.go | 54 +++ .../handlers/tasks/{var_test.go => setup.go} | 0 internal/api/handlers/tasks/setup_test.go | 54 +++ internal/api/handlers/tasks/task.go | 4 +- internal/api/handlers/tasks/task_test.go | 367 +++++++++++++++++- .../handlers/users/{var_test.go => setup.go} | 8 - internal/api/handlers/users/user.go | 14 +- internal/api/handlers/users/user_test.go | 146 ++++++- internal/repositories/task/task.go | 6 +- internal/repositories/user/user.go | 6 +- 20 files changed, 713 insertions(+), 42 deletions(-) create mode 100644 coverage.log create mode 100644 datajson/CHANGELOG.md create mode 100644 datajson/login.json create mode 100644 datajson/task.json create mode 100644 datajson/user.json rename internal/api/handlers/common/{var_test.go => setup.go} (100%) create mode 100644 internal/api/handlers/common/setup_test.go rename internal/api/handlers/tasks/{var_test.go => setup.go} (100%) create mode 100644 internal/api/handlers/tasks/setup_test.go rename internal/api/handlers/users/{var_test.go => setup.go} (63%) diff --git a/Makefile b/Makefile index cd12576a9..3e4283272 100644 --- a/Makefile +++ b/Makefile @@ -12,15 +12,15 @@ migration-down: @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down @migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down -test-migration: - @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down - @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations up +### Test +test-api-common: + go test -cover -coverprofile coverage.log ./internal/api/handlers/common/... -test-all: - go test ./... +test-api-task: + go test -cover -coverprofile coverage.log ./internal/api/handlers/tasks/... -integration-test: - go test ./integrationtest +test-api-user: + go test -cover -coverprofile coverage.log ./internal/api/handlers/users/... nodemon: nodemon --exec go run cmd/main.go --signal SIGTERM diff --git a/README.md b/README.md index b059ebf1b..78fa0fc8e 100644 --- a/README.md +++ b/README.md @@ -83,10 +83,15 @@ go run cmd/main.go 7. If you want to integration test after run projection ```bash -make integration-test + go test ./integrationtest ``` -8. If you want to remove table database +8. If you want to test all after run projection +```bash + go test ./... +``` + +9. If you want to remove table database ```bash make migration-down -``` \ No newline at end of file +``` diff --git a/coverage.log b/coverage.log new file mode 100644 index 000000000..1607548cc --- /dev/null +++ b/coverage.log @@ -0,0 +1,21 @@ +mode: set +github.com/manabie-com/togo/internal/api/handlers/users/api.go:9.67,11.2 2 0 +github.com/manabie-com/togo/internal/api/handlers/users/api.go:11.2,13.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:10.53,12.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:16.2,17.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.2,21.15 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:25.2,25.22 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:12.16,14.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:17.16,19.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.15,23.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:28.32,31.2 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:13.63,14.32 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:14.32,16.56 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:21.3,22.17 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.3,27.18 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:32.3,34.52 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:39.3,39.73 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:16.56,19.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:22.17,25.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.18,30.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:34.52,37.4 2 1 diff --git a/datajson/CHANGELOG.md b/datajson/CHANGELOG.md new file mode 100644 index 000000000..d39e2be6b --- /dev/null +++ b/datajson/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create datajson diff --git a/datajson/login.json b/datajson/login.json new file mode 100644 index 000000000..b91dd3e71 --- /dev/null +++ b/datajson/login.json @@ -0,0 +1,4 @@ +{ + "username":"manabie", + "password":"example" +} \ No newline at end of file diff --git a/datajson/task.json b/datajson/task.json new file mode 100644 index 000000000..2fa4d22b3 --- /dev/null +++ b/datajson/task.json @@ -0,0 +1,3 @@ +{ + "content":"123" +} \ No newline at end of file diff --git a/datajson/user.json b/datajson/user.json new file mode 100644 index 000000000..e8d4916f1 --- /dev/null +++ b/datajson/user.json @@ -0,0 +1,4 @@ +{ + "username":"user-manabie-1", + "password": "123456" +} \ No newline at end of file diff --git a/internal/api/handlers/common/common.go b/internal/api/handlers/common/common.go index dd0b17b43..dd319d492 100644 --- a/internal/api/handlers/common/common.go +++ b/internal/api/handlers/common/common.go @@ -1,8 +1,6 @@ package common import ( - "encoding/json" - "fmt" "net/http" "strconv" @@ -32,8 +30,6 @@ func Login(service handlers.MainUseCase) gin.HandlerFunc { responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail Login") return } - test, _ := json.Marshal(user) - fmt.Println("test ", string(test)) if user == nil { responses.ResponseForError(ctx, nil, http.StatusBadRequest, "Fail Login") diff --git a/internal/api/handlers/common/common_test.go b/internal/api/handlers/common/common_test.go index 443716ed9..94b8f9120 100644 --- a/internal/api/handlers/common/common_test.go +++ b/internal/api/handlers/common/common_test.go @@ -61,4 +61,29 @@ func TestLogin(t *testing.T) { assert.Equal(t, http.StatusOK, w.Code) } + { //Fail case + user := models.User{ + Username: "manabie-test", + Password: "123456", + } + + jsonValue, _ := json.Marshal(user) + req, _ := http.NewRequest(http.MethodPost, "/example", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusNotFound, w.Code) + } + + { //Fail case + user := models.User{ + Username: "manabie-test", + Password: "123456", + } + + jsonValue, _ := json.Marshal(user) + req, _ := http.NewRequest(http.MethodPost, "/login", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusBadRequest, w.Code) + } } diff --git a/internal/api/handlers/common/var_test.go b/internal/api/handlers/common/setup.go similarity index 100% rename from internal/api/handlers/common/var_test.go rename to internal/api/handlers/common/setup.go diff --git a/internal/api/handlers/common/setup_test.go b/internal/api/handlers/common/setup_test.go new file mode 100644 index 000000000..76b8860bc --- /dev/null +++ b/internal/api/handlers/common/setup_test.go @@ -0,0 +1,54 @@ +package common + +import ( + "testing" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/utils" + "github.com/stretchr/testify/require" +) + +func Test_recordStats(t *testing.T) { + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + { + user := &models.User{ + Username: "manabie-test-2", + Password: "123456", + } + + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err = recordStats(db, user.Username, user.Password) + require.Nil(t, err) + } + + { //Fail case + user := &models.User{ + Username: "", + Password: "", + } + + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err = recordStats(db, user.Username, user.Password) + require.Nil(t, err) + } +} diff --git a/internal/api/handlers/tasks/var_test.go b/internal/api/handlers/tasks/setup.go similarity index 100% rename from internal/api/handlers/tasks/var_test.go rename to internal/api/handlers/tasks/setup.go diff --git a/internal/api/handlers/tasks/setup_test.go b/internal/api/handlers/tasks/setup_test.go new file mode 100644 index 000000000..9e2b036ef --- /dev/null +++ b/internal/api/handlers/tasks/setup_test.go @@ -0,0 +1,54 @@ +package tasks + +import ( + "testing" + + "github.com/DATA-DOG/go-sqlmock" + "github.com/manabie-com/togo/internal/models" + "github.com/manabie-com/togo/utils" + "github.com/stretchr/testify/require" +) + +func Test_recordStats(t *testing.T) { + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + { + user := &models.User{ + Username: "manabie-test-2", + Password: "123456", + } + + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err = recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + } + + { //Fail case + user := &models.User{ + Username: "", + Password: "", + } + + // Create mock data for test + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err = recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + } +} diff --git a/internal/api/handlers/tasks/task.go b/internal/api/handlers/tasks/task.go index 488b82ea6..8ee93db60 100644 --- a/internal/api/handlers/tasks/task.go +++ b/internal/api/handlers/tasks/task.go @@ -52,10 +52,10 @@ func AddTask(service handlers.MainUseCase) gin.HandlerFunc { input.CreateDate = createDate // New - out := task.NewTask(input) + newTask := task.NewTask(input) // Create Task - if err := service.Task.AddTask(out); err != nil { + if err := service.Task.AddTask(newTask); err != nil { responses.ResponseForError(ctx, err, http.StatusBadRequest, "Fail Add Task") return } diff --git a/internal/api/handlers/tasks/task_test.go b/internal/api/handlers/tasks/task_test.go index 6fd2213f3..10df65f2c 100644 --- a/internal/api/handlers/tasks/task_test.go +++ b/internal/api/handlers/tasks/task_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestAddTask(t *testing.T) { +func TestAddTask_FailCase(t *testing.T) { t.Parallel() db, mock, err := setupMock() if err != nil { @@ -39,7 +39,21 @@ func TestAddTask(t *testing.T) { repositories := handlers.NewRepositories(db) authUsecase := authorization.NewAuthUseCase(repositories.Auth) - { //Fail case + { //Fail case - Not found + req, _ := http.NewRequest(http.MethodPost, "/example", nil) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusNotFound, w.Code) + } + + { //Fail case - No Login + req, _ := http.NewRequest(http.MethodPost, "/tasks", nil) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusUnauthorized, w.Code) + } + + { //Fail case - Max Task Per Day // Create mock data User for test user := models.User{ Username: "manabie-test-3", @@ -88,4 +102,353 @@ func TestAddTask(t *testing.T) { r.ServeHTTP(w, req) assert.Equal(t, http.StatusInternalServerError, w.Code) } + +} + +func TestAddTask_FailCase_NoHaveUserReference(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/tasks", AddTask(service)) + + //Generate token + repositories := handlers.NewRepositories(db) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + + { //Fail case - + // Create mock data User for test + user := models.User{ + Username: "manabie-test-3", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := models.Task{ + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "no_have", + } + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + + //Generate token + token, err := authUsecase.GenerateToken(input.UserID, "0") + require.Nil(t, err) + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusInternalServerError, w.Code) + } +} + +func TestAddTask_FailCase_UserIDEmpty(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/tasks", AddTask(service)) + + //Generate token + repositories := handlers.NewRepositories(db) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + + { + // Create mock data User for test + user := models.User{ + Username: "manabie-test-5", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := models.Task{ + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "", + } + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + + //Generate token + token, err := authUsecase.GenerateToken("2", "0") + require.Nil(t, err) + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusBadRequest, w.Code) + } +} + +func TestAddTask_FailCase_CreateDateEmpty(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/tasks", AddTask(service)) + + //Generate token + repositories := handlers.NewRepositories(db) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + + { + // Create mock data User for test + user := models.User{ + Username: "manabie-test-5", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := models.Task{ + Content: "Test Interview", + CreateDate: "", + UserID: "1", + } + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + + //Generate token + token, err := authUsecase.GenerateToken(input.UserID, "0") + require.Nil(t, err) + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusBadRequest, w.Code) + } +} + +func TestAddTask_FailCase_UserIDAndCreateDateEmpty(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/tasks", AddTask(service)) + + //Generate token + repositories := handlers.NewRepositories(db) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + + { + // Create mock data User for test + user := models.User{ + Username: "manabie-test-6", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := models.Task{ + Content: "Test Interview", + CreateDate: "", + UserID: "", + } + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("1", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + + //Generate token + token, err := authUsecase.GenerateToken("5", "5") + require.Nil(t, err) + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusBadRequest, w.Code) + } +} + +func TestAddTask_Success(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + utils.LoadEnv("../../../../.env") + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/tasks", AddTask(service)) + + //Generate token + repositories := handlers.NewRepositories(db) + authUsecase := authorization.NewAuthUseCase(repositories.Auth) + + { //Success case + // Create mock data User for test + user := models.User{ + Username: "manabie-test-3", + Password: "123456", + } + mock.ExpectExec("INSERT INTO users"). + WithArgs(1, user.Username, user.Password, 5). + WillReturnResult(sqlmock.NewResult(1, 1)) + + // Create Data + err := recordStatsUser(db, user.Username, user.Password) + require.Nil(t, err) + + input := models.Task{ + ID: "task-3", + Content: "Test Interview", + CreateDate: time.Now().Format("2006-01-02"), + UserID: "1", + } + + rows := sqlmock.NewRows([]string{"id", "content", "create_date", "user_id"}). + AddRow("task-3", input.Content, input.CreateDate, 1) + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "tasks" WHERE (user_id = $1 and create_date = $2)`)). + WithArgs(input.UserID, input.CreateDate). + WillReturnRows(rows) + + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "tasks" ("id","content","create_date","user_id") VALUES ($1,$2,$3,$4) RETURNING "tasks"."id"`)). + WithArgs(input.ID, input.Content, input.CreateDate, input.UserID). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + + //Generate token + token, err := authUsecase.GenerateToken(input.UserID, "6") + require.Nil(t, err) + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/tasks", bytes.NewBuffer(jsonValue)) + cookie := &http.Cookie{ + Name: constants.CookieTokenKey, + Value: utils.SafeString(token), + MaxAge: 300, + } + req.AddCookie(cookie) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusCreated, w.Code) + } } diff --git a/internal/api/handlers/users/var_test.go b/internal/api/handlers/users/setup.go similarity index 63% rename from internal/api/handlers/users/var_test.go rename to internal/api/handlers/users/setup.go index 00aea5d6a..f747d78a6 100644 --- a/internal/api/handlers/users/var_test.go +++ b/internal/api/handlers/users/setup.go @@ -29,11 +29,3 @@ func SetUpRouter() *gin.Engine { router := gin.Default() return router } - -// func recordStats(db *gorm.DB, username, password string) (err error) { -// _, err = db.CommonDB().Exec("INSERT INTO users (id, username,password,max_task_per_day) VALUES (?, ?,?,?,?)", 1, username, password, 5) -// if err != nil { -// return errors.Wrap(err, fmt.Sprintf("error '%s' was not expected, while inserting a row", err)) -// } -// return -// } diff --git a/internal/api/handlers/users/user.go b/internal/api/handlers/users/user.go index 541ec6f58..41473128f 100644 --- a/internal/api/handlers/users/user.go +++ b/internal/api/handlers/users/user.go @@ -10,15 +10,9 @@ import ( "github.com/manabie-com/togo/internal/repositories/user" ) -type Input struct { - Username string `json:"username" validate:"required"` - Password string `json:"password" validate:"required"` - MaxTaskPerDay int `json:"max_task_per_day,omitempty"` -} - func CreateUser(service handlers.MainUseCase) gin.HandlerFunc { return func(ctx *gin.Context) { - var inputUser Input + var inputUser models.User if err := ctx.ShouldBindJSON(&inputUser); err != nil { responses.ResponseForError(ctx, err, http.StatusInternalServerError, "Fail BindJSON user") return @@ -35,11 +29,7 @@ func CreateUser(service handlers.MainUseCase) gin.HandlerFunc { return } - input := user.New(&models.User{ - Username: inputUser.Username, - Password: inputUser.Password, - MaxTaskPerDay: inputUser.MaxTaskPerDay, - }) + input := user.New(&inputUser) if err := service.User.Create(input); err != nil { responses.ResponseForError(ctx, nil, http.StatusInternalServerError, "Fail CreateUser") diff --git a/internal/api/handlers/users/user_test.go b/internal/api/handlers/users/user_test.go index cb17eb710..3049f5645 100644 --- a/internal/api/handlers/users/user_test.go +++ b/internal/api/handlers/users/user_test.go @@ -9,13 +9,14 @@ import ( "regexp" "testing" + "github.com/DATA-DOG/go-sqlmock" "github.com/manabie-com/togo/internal/api/handlers" "github.com/manabie-com/togo/internal/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) -func TestCreateUser(t *testing.T) { +func TestCreateUser_FailCase(t *testing.T) { t.Parallel() db, mock, err := setupMock() if err != nil { @@ -30,7 +31,7 @@ func TestCreateUser(t *testing.T) { service := handlers.HandleService(db) r.POST("/users", CreateUser(service)) - { //Fail case + { //Fail case - Not found input := &models.User{ ID: "2", Username: "", @@ -48,6 +49,108 @@ func TestCreateUser(t *testing.T) { WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) mock.ExpectCommit() + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/example", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusNotFound, w.Code) + } + + { //Fail case - Username is empty + input := &models.User{ + ID: "2", + Username: "", + Password: "123456", + MaxTaskPerDay: 5, + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnError(fmt.Errorf("")) + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) + mock.ExpectCommit() + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusInternalServerError, w.Code) + } + + { //Fail case - Password is empty + input := &models.User{ + ID: "3", + Username: "manabie-fail-1", + Password: "", + MaxTaskPerDay: 5, + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnError(fmt.Errorf("")) + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) + mock.ExpectCommit() + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusInternalServerError, w.Code) + } + + { //Fail case - Usernamd Password are empty + input := &models.User{ + ID: "3", + Username: "manabie-fail-1", + Password: "", + MaxTaskPerDay: 5, + } + + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnError(fmt.Errorf("invalid password")) + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay) + mock.ExpectCommit() + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusInternalServerError, w.Code) + } + + { //Fail case - conflic data + input := &models.User{ + ID: "user-1", + Username: "new-manabie-1", + Password: "123456", + MaxTaskPerDay: 5, + } + rows := sqlmock.NewRows([]string{"id", "username", "password", "max_task_per_day"}). + AddRow("user-3", input.Username, input.Password, 5) + mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "users" WHERE (username = $1) ORDER BY "users"."id" ASC LIMIT 1`)). + WithArgs(input.Username). + WillReturnRows(rows) + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users" ("id","username","password","max_task_per_day") VALUES ($1,$2,$3,$4) RETURNING "users"."id"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + jsonValue, _ := json.Marshal(input) req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) w := httptest.NewRecorder() @@ -55,3 +158,42 @@ func TestCreateUser(t *testing.T) { assert.Equal(t, http.StatusInternalServerError, w.Code) } } + +func TestCreateUser_SuccessCase(t *testing.T) { + t.Parallel() + db, mock, err := setupMock() + if err != nil { + t.Fatalf("an error '%s' was not expected when opening stub database connection", err) + } + require.Nil(t, err) + require.NotNil(t, mock) + require.NotNil(t, db) + + defer db.Close() + r := SetUpRouter() + service := handlers.HandleService(db) + r.POST("/users", CreateUser(service)) + + { //Success case + input := &models.User{ + ID: "user-3", + Username: "new-manabie-3", + Password: "123456", + MaxTaskPerDay: 5, + } + + // Create mock data for test + mock.ExpectBegin() + mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "users" ("id","username","password","max_task_per_day") VALUES ($1,$2,$3,$4) RETURNING "users"."id"`)). + WithArgs(input.ID, input.Username, input.Password, input.MaxTaskPerDay). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1)) + mock.ExpectCommit() + + jsonValue, _ := json.Marshal(input) + req, _ := http.NewRequest(http.MethodPost, "/users", bytes.NewBuffer(jsonValue)) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + assert.Equal(t, http.StatusCreated, w.Code) + } + +} diff --git a/internal/repositories/task/task.go b/internal/repositories/task/task.go index bf73b3fe0..0130669c3 100644 --- a/internal/repositories/task/task.go +++ b/internal/repositories/task/task.go @@ -20,8 +20,12 @@ func NewTaskRepository(db *gorm.DB) task.TaskUseCase { } func NewTask(task models.Task) *models.Task { + taskID := id.NewID().String() + if task.ID != "" { + taskID = task.ID + } return &models.Task{ - ID: id.NewID().String(), + ID: taskID, Content: task.Content, CreateDate: task.CreateDate, UserID: task.UserID, diff --git a/internal/repositories/user/user.go b/internal/repositories/user/user.go index 523224af6..ad92e5efc 100644 --- a/internal/repositories/user/user.go +++ b/internal/repositories/user/user.go @@ -20,8 +20,12 @@ func NewUserRepository(db *gorm.DB) user.UserRepository { } func New(user *models.User) *models.User { + userID := id.NewID().String() + if user.ID != "" { + userID = user.ID + } return &models.User{ - ID: id.NewID().String(), + ID: userID, Username: user.Username, Password: user.Password, MaxTaskPerDay: user.MaxTaskPerDay, From a7628ef564b56ed9a774239db3a86281568475ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 23:25:45 +0700 Subject: [PATCH 33/61] add datajson --- datajson/task.json | 4 ++-- datajson/user.json | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/datajson/task.json b/datajson/task.json index 2fa4d22b3..e0350bb61 100644 --- a/datajson/task.json +++ b/datajson/task.json @@ -1,3 +1,3 @@ { - "content":"123" -} \ No newline at end of file + "content":"New Task 1" +} diff --git a/datajson/user.json b/datajson/user.json index e8d4916f1..b86cc2b0c 100644 --- a/datajson/user.json +++ b/datajson/user.json @@ -1,4 +1,5 @@ { "username":"user-manabie-1", - "password": "123456" -} \ No newline at end of file + "password": "123456", + "max_task_per_day": 10 +} From d16dbcaaefbd88f347776bac9943d2abf9dda3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 23:26:32 +0700 Subject: [PATCH 34/61] Remove unuse --- coverage.log | 21 --------------------- datajson/login.json | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 coverage.log diff --git a/coverage.log b/coverage.log deleted file mode 100644 index 1607548cc..000000000 --- a/coverage.log +++ /dev/null @@ -1,21 +0,0 @@ -mode: set -github.com/manabie-com/togo/internal/api/handlers/users/api.go:9.67,11.2 2 0 -github.com/manabie-com/togo/internal/api/handlers/users/api.go:11.2,13.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:10.53,12.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:16.2,17.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.2,21.15 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:25.2,25.22 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:12.16,14.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:17.16,19.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.15,23.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:28.32,31.2 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:13.63,14.32 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:14.32,16.56 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:21.3,22.17 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.3,27.18 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:32.3,34.52 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:39.3,39.73 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:16.56,19.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:22.17,25.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.18,30.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:34.52,37.4 2 1 diff --git a/datajson/login.json b/datajson/login.json index b91dd3e71..562f4fabb 100644 --- a/datajson/login.json +++ b/datajson/login.json @@ -1,4 +1,4 @@ { "username":"manabie", "password":"example" -} \ No newline at end of file +} From d23f9e9562ce63dee850e31e0caaeb353997336c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 23:31:03 +0700 Subject: [PATCH 35/61] Update README --- README.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 78fa0fc8e..130cbcc5d 100644 --- a/README.md +++ b/README.md @@ -68,30 +68,28 @@ git clone https://github.com/DuongThanhTin/togo.git 2. Create Database postgres with your config -3. Go to folder project +3. Change data variable in file .env with your config on step 2 -4. Change data variable in file .env with your config - -5. Migration database with terminal +4. Migration database with terminal ```bash make migration-up ``` -6. Run main.go +5. Run main.go ```bash go run cmd/main.go ``` -7. If you want to integration test after run projection +#### If you want to integration test after run projection ```bash go test ./integrationtest ``` -8. If you want to test all after run projection +#### If you want to test all after run projection ```bash go test ./... ``` -9. If you want to remove table database +#### If you want to remove table database ```bash -make migration-down + make migration-down ``` From 2171cd1eefd9f1f355907467e4465a444482d2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 23:35:02 +0700 Subject: [PATCH 36/61] Add more in Readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 130cbcc5d..b8da2ac88 100644 --- a/README.md +++ b/README.md @@ -84,12 +84,12 @@ go run cmd/main.go go test ./integrationtest ``` -#### If you want to test all after run projection +#### If you want to unit test test after run projection ```bash - go test ./... + go test ./internal/api/handlers/... ``` -#### If you want to remove table database +#### If you want to remove table on database ```bash make migration-down ``` From dedf200ffc35acc594990e4adb7ec48cc8b8479a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Mon, 27 Jun 2022 23:44:38 +0700 Subject: [PATCH 37/61] Readme --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3e4283272..9da70bde0 100644 --- a/Makefile +++ b/Makefile @@ -22,5 +22,5 @@ test-api-task: test-api-user: go test -cover -coverprofile coverage.log ./internal/api/handlers/users/... -nodemon: - nodemon --exec go run cmd/main.go --signal SIGTERM +test: + go test ./internal/api/handlers/... From a18559d714fd60a77642ea21233efaf8c983380c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 00:03:57 +0700 Subject: [PATCH 38/61] Add README --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b8da2ac88..f1907fe51 100644 --- a/README.md +++ b/README.md @@ -64,17 +64,23 @@ The repository have a few main features 1. Clone repository ```bash git clone https://github.com/DuongThanhTin/togo.git +cd togo ``` 2. Create Database postgres with your config 3. Change data variable in file .env with your config on step 2 -4. Migration database with terminal +4. Install package +```bash +go get -v github.com/manabie-com/togo/... +``` + +5. Migration database with terminal ```bash make migration-up ``` -5. Run main.go +6. Run main.go ```bash go run cmd/main.go ``` From 4fecb99cf7579e3fa4d0f738839e4a31d44b73d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 00:04:19 +0700 Subject: [PATCH 39/61] Add CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 970b3219d..9ac8b5be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Create README - Make create `integrationtest` - Make create terminal in `Makefile` - Initial and structure for project From f6cd09b81af394764612c95ef25d829d57e722c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 00:46:31 +0700 Subject: [PATCH 40/61] add more utils --- constants/constants.go | 2 +- utils/utils.go | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/constants/constants.go b/constants/constants.go index 4d85500ac..30e7e79e0 100644 --- a/constants/constants.go +++ b/constants/constants.go @@ -1,7 +1,7 @@ package constants const ( - FileEnvironment = "../.env" + FileEnvironment = ".env" DsnEnvironment = "DSN_POSTGRES" ) diff --git a/utils/utils.go b/utils/utils.go index b76891ea9..394205a29 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1,8 +1,10 @@ package utils import ( + "fmt" "log" "os" + "strings" "github.com/caarlos0/env" "github.com/joho/godotenv" @@ -51,7 +53,8 @@ type Environment struct { var Env *Environment func LoadEnv(file string) { - err := godotenv.Load(file) + fileName := getPathfile(file) + err := godotenv.Load(fileName) if err != nil { log.Fatalf("Some error occured. Err: %s", err) } @@ -77,3 +80,12 @@ func getEnvironmentFromEnv(object *Environment) { } env.Parse(object) } + +func getPathfile(fileName string) string { + path, err := os.Getwd() + if err != nil { + log.Println(err) + } + curArr := strings.Split(path, "/cmd") + return fmt.Sprintf("%s/%s", curArr[0], fileName) +} From 2332b068aa7e66e6f7d1949d25b368e35996ef11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 00:58:18 +0700 Subject: [PATCH 41/61] Add .env.example --- .env.example | 24 ++++++++++++++++++++++++ .gitignore | 3 ++- README.md | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 000000000..de4a1e7e3 --- /dev/null +++ b/.env.example @@ -0,0 +1,24 @@ +# Common +PORT= + +# JWT +JWT_KEY=eyJhbGciOiJIUzI1NiJ9 +JWT_TIMEOUT=60 + +HOST="" + +# Setup DB +DB_DRIVER="" +DB_HOST="" +DB_PORT=5432 +DB_USER="" +DB_PASSWORD="" +DB_NAME="" +DB_SSL_MODE="disable" +DSN_POSTGRES="host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE}" + +# URL for migration +POSTGRESQL_URL_MIGRATION="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSL_MODE}" + +# INTERGRATION_TEST +INTERGRATION_TEST_PORT= diff --git a/.gitignore b/.gitignore index a512c8b38..c584ca2a3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ out/ -.idea \ No newline at end of file +.idea +.env \ No newline at end of file diff --git a/README.md b/README.md index f1907fe51..8640a4ce7 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ The repository have a few main features ```bash git clone https://github.com/DuongThanhTin/togo.git cd togo +cp .env.example .env ``` 2. Create Database postgres with your config From 4e14989b673d4d2800a316d7e75519abac2555af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 00:59:25 +0700 Subject: [PATCH 42/61] remove --- .env | 24 ------------------------ .gitignore | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index a8080a633..000000000 --- a/.env +++ /dev/null @@ -1,24 +0,0 @@ -# Common -PORT=8000 - -# JWT -JWT_KEY=eyJhbGciOiJIUzI1NiJ9 -JWT_TIMEOUT=60 - -HOST="localhost" - -# Setup DB -DB_DRIVER="postgres" -DB_HOST="localhost" -DB_PORT=5432 -DB_USER="postgres" -DB_PASSWORD="tinproqn113" -DB_NAME="todo" -DB_SSL_MODE="disable" -DSN_POSTGRES="host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE}" - -# URL for migration -POSTGRESQL_URL_MIGRATION="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSL_MODE}" - -# INTERGRATION_TEST -INTERGRATION_TEST_PORT=8080 diff --git a/.gitignore b/.gitignore index c584ca2a3..c1986bbbe 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ out/ .idea -.env \ No newline at end of file +.env From a285e7dfd845a90d1494d0ed2a83d62882cc6147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 07:06:06 +0700 Subject: [PATCH 43/61] Add test-all in Makefile --- Makefile | 4 +-- coverage.log | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 coverage.log diff --git a/Makefile b/Makefile index 9da70bde0..2e1273049 100644 --- a/Makefile +++ b/Makefile @@ -22,5 +22,5 @@ test-api-task: test-api-user: go test -cover -coverprofile coverage.log ./internal/api/handlers/users/... -test: - go test ./internal/api/handlers/... +test-all: + go test -cover -coverprofile coverage.log ./internal/api/handlers/... diff --git a/coverage.log b/coverage.log new file mode 100644 index 000000000..f19a5ba5b --- /dev/null +++ b/coverage.log @@ -0,0 +1,98 @@ +mode: set +github.com/manabie-com/togo/internal/api/handlers/handlers.go:36.39,38.2 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:40.42,54.2 5 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:56.45,58.2 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:60.51,66.2 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:74.81,76.16 2 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:80.2,80.19 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:84.2,84.40 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:76.16,78.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:80.19,82.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:87.73,89.16 2 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:93.2,93.38 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:97.2,98.114 2 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:102.2,102.16 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:106.2,106.30 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:110.2,111.9 2 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:115.2,116.9 2 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:120.2,125.22 2 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:89.16,91.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:93.38,95.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:98.114,100.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:102.16,104.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:106.30,108.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:111.9,113.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/handlers.go:116.9,118.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/api.go:9.67,11.2 2 0 +github.com/manabie-com/togo/internal/api/handlers/users/api.go:11.2,13.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:10.53,12.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:16.2,17.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.2,21.15 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:25.2,25.22 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:12.16,14.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:17.16,19.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.15,23.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/users/setup.go:28.32,31.2 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:13.63,14.32 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:14.32,16.56 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:21.3,22.17 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.3,27.18 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:32.3,34.52 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:39.3,39.73 1 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:16.56,19.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:22.17,25.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.18,30.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/users/user.go:34.52,37.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/api.go:10.67,13.2 3 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/api.go:13.2,15.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:12.53,14.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:18.2,19.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:23.2,23.15 1 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:27.2,27.22 1 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:14.16,16.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:19.16,21.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:23.15,25.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:30.32,33.2 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:35.74,37.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:40.2,40.8 1 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:37.16,39.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:16.60,17.32 1 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:17.32,19.17 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:25.3,26.17 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:30.3,34.17 3 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:40.3,40.49 1 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:46.3,47.46 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:51.3,58.55 4 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:63.3,63.67 1 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:19.17,22.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:26.17,29.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:34.17,37.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:40.49,43.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:47.46,50.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:58.55,61.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:67.65,69.2 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/api.go:9.67,11.2 2 0 +github.com/manabie-com/togo/internal/api/handlers/common/api.go:11.2,13.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:20.58,21.32 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:21.32,23.56 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:28.3,29.17 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:34.3,34.18 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:39.3,42.17 3 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:47.3,47.36 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:53.3,55.62 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:23.56,26.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:29.17,32.4 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:34.18,37.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:42.17,45.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/common/common.go:47.36,50.4 2 0 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:12.53,14.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:18.2,19.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:23.2,23.15 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:27.2,27.22 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:14.16,16.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:19.16,21.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:23.15,25.3 1 0 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:30.32,33.2 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:35.70,37.16 2 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:40.2,40.8 1 1 +github.com/manabie-com/togo/internal/api/handlers/common/setup.go:37.16,39.3 1 0 From 1a7b3eb1700d7d88a7f3f17f72c684169b8966ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 07:08:07 +0700 Subject: [PATCH 44/61] Remove unuse --- coverage.log | 98 ---------------------------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 coverage.log diff --git a/coverage.log b/coverage.log deleted file mode 100644 index f19a5ba5b..000000000 --- a/coverage.log +++ /dev/null @@ -1,98 +0,0 @@ -mode: set -github.com/manabie-com/togo/internal/api/handlers/handlers.go:36.39,38.2 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:40.42,54.2 5 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:56.45,58.2 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:60.51,66.2 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:74.81,76.16 2 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:80.2,80.19 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:84.2,84.40 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:76.16,78.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:80.19,82.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:87.73,89.16 2 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:93.2,93.38 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:97.2,98.114 2 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:102.2,102.16 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:106.2,106.30 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:110.2,111.9 2 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:115.2,116.9 2 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:120.2,125.22 2 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:89.16,91.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:93.38,95.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:98.114,100.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:102.16,104.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:106.30,108.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:111.9,113.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/handlers.go:116.9,118.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/api.go:9.67,11.2 2 0 -github.com/manabie-com/togo/internal/api/handlers/users/api.go:11.2,13.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:10.53,12.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:16.2,17.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.2,21.15 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:25.2,25.22 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:12.16,14.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:17.16,19.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:21.15,23.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/users/setup.go:28.32,31.2 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:13.63,14.32 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:14.32,16.56 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:21.3,22.17 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.3,27.18 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:32.3,34.52 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:39.3,39.73 1 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:16.56,19.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:22.17,25.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:27.18,30.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/users/user.go:34.52,37.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/api.go:10.67,13.2 3 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/api.go:13.2,15.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:12.53,14.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:18.2,19.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:23.2,23.15 1 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:27.2,27.22 1 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:14.16,16.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:19.16,21.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:23.15,25.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:30.32,33.2 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:35.74,37.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:40.2,40.8 1 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/setup.go:37.16,39.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:16.60,17.32 1 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:17.32,19.17 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:25.3,26.17 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:30.3,34.17 3 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:40.3,40.49 1 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:46.3,47.46 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:51.3,58.55 4 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:63.3,63.67 1 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:19.17,22.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:26.17,29.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:34.17,37.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:40.49,43.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:47.46,50.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:58.55,61.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/tasks/task.go:67.65,69.2 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/api.go:9.67,11.2 2 0 -github.com/manabie-com/togo/internal/api/handlers/common/api.go:11.2,13.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:20.58,21.32 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:21.32,23.56 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:28.3,29.17 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:34.3,34.18 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:39.3,42.17 3 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:47.3,47.36 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:53.3,55.62 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:23.56,26.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:29.17,32.4 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:34.18,37.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:42.17,45.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/common/common.go:47.36,50.4 2 0 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:12.53,14.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:18.2,19.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:23.2,23.15 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:27.2,27.22 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:14.16,16.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:19.16,21.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:23.15,25.3 1 0 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:30.32,33.2 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:35.70,37.16 2 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:40.2,40.8 1 1 -github.com/manabie-com/togo/internal/api/handlers/common/setup.go:37.16,39.3 1 0 From 7cbb3ac287f38e014c2414d95602a69aa80c96bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 09:22:31 +0700 Subject: [PATCH 45/61] update README --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8640a4ce7..5c269c123 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,11 @@ The repository have a few main features ### How to start +#### Prepare + +- Install golang [golang](https://go.dev/doc/install) +- Install postgres + #### Start local 1. Clone repository ```bash @@ -72,16 +77,11 @@ cp .env.example .env 3. Change data variable in file .env with your config on step 2 -4. Install package -```bash -go get -v github.com/manabie-com/togo/... -``` - -5. Migration database with terminal +4. Migration database with terminal ```bash make migration-up ``` -6. Run main.go +5. Run main.go ```bash go run cmd/main.go ``` From 1fd7961e49a9313419f9a3c836c901ad283b147f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 09:26:00 +0700 Subject: [PATCH 46/61] Update readme to run project --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 2e1273049..b65284e4d 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,10 @@ migration-down: @echo migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down @migrate -database ${POSTGRESQL_URL_MIGRATION} -path db/migrations down +### Run project +run: + go run cmd/main.go + ### Test test-api-common: go test -cover -coverprofile coverage.log ./internal/api/handlers/common/... From 64308a243258dd183446bfd5e9a4131a1461f5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Tue, 28 Jun 2022 20:55:15 +0700 Subject: [PATCH 47/61] add more detail for env example --- .env.example | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index de4a1e7e3..a120d0827 100644 --- a/.env.example +++ b/.env.example @@ -1,19 +1,19 @@ # Common -PORT= +PORT=8000 # JWT JWT_KEY=eyJhbGciOiJIUzI1NiJ9 JWT_TIMEOUT=60 -HOST="" +HOST="localhost" # Setup DB -DB_DRIVER="" -DB_HOST="" +DB_DRIVER="postgres" +DB_HOST="localhost" DB_PORT=5432 -DB_USER="" -DB_PASSWORD="" -DB_NAME="" +DB_USER="postgres" +DB_PASSWORD="manabie123" +DB_NAME="togo" DB_SSL_MODE="disable" DSN_POSTGRES="host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE}" From 5fff17c2d12b3221d76cf1c179acffaca0698b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 10:55:39 +0700 Subject: [PATCH 48/61] Update README and Makefile --- Makefile | 17 ++++++----------- README.md | 7 ++++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index b65284e4d..4292c5dda 100644 --- a/Makefile +++ b/Makefile @@ -16,15 +16,10 @@ migration-down: run: go run cmd/main.go -### Test -test-api-common: - go test -cover -coverprofile coverage.log ./internal/api/handlers/common/... +### Unit test +test-unit: + go test -cover -coverprofile coverage.log ./internal/... -test-api-task: - go test -cover -coverprofile coverage.log ./internal/api/handlers/tasks/... - -test-api-user: - go test -cover -coverprofile coverage.log ./internal/api/handlers/users/... - -test-all: - go test -cover -coverprofile coverage.log ./internal/api/handlers/... +### Integraion test +test-integration: + go test ./integrationtest/... diff --git a/README.md b/README.md index 5c269c123..3f9d702be 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ The repository have a few main features - Install golang [golang](https://go.dev/doc/install) - Install postgres +- Install migrate If you want to migration [migration](https://github.com/golang-migrate/migrate) #### Start local 1. Clone repository @@ -77,7 +78,7 @@ cp .env.example .env 3. Change data variable in file .env with your config on step 2 -4. Migration database with terminal +4. Migration database with terminal (If you want to migrate) ```bash make migration-up ``` @@ -88,12 +89,12 @@ go run cmd/main.go #### If you want to integration test after run projection ```bash - go test ./integrationtest +go test ./integrationtest ``` #### If you want to unit test test after run projection ```bash - go test ./internal/api/handlers/... +go test ./internal/api/handlers/... ``` #### If you want to remove table on database From d01d61ebb85f2803ab3420b95e2ac9dbdf6af251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 11:03:49 +0700 Subject: [PATCH 49/61] Update README --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f9d702be..76d8533a3 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,30 @@ The repository have a few main features #### Prepare - Install golang [golang](https://go.dev/doc/install) -- Install postgres +- Install postgres [postgreSQL](https://www.postgresql.org/download) - Install migrate If you want to migration [migration](https://github.com/golang-migrate/migrate) + . MacOS + ```bash + $ brew install golang-migrate + ``` + + . Windows + + Using [scoop](https://scoop.sh/) + + ```bash + $ scoop install migrate + ``` + + . Linux + + ```bash + $ curl -L https://packagecloud.io/golang-migrate/migrate/gpgkey | apt-key add - + $ echo "deb https://packagecloud.io/golang-migrate/migrate/ubuntu/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/migrate.list + $ apt-get update + $ apt-get install -y migrate + ``` #### Start local 1. Clone repository ```bash From ae910f176085d59fb8767b9ee8ad7c6e832e168f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 11:04:27 +0700 Subject: [PATCH 50/61] wip --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 76d8533a3..0f367f41b 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ The repository have a few main features - Install golang [golang](https://go.dev/doc/install) - Install postgres [postgreSQL](https://www.postgresql.org/download) - Install migrate If you want to migration [migration](https://github.com/golang-migrate/migrate) + . MacOS ```bash @@ -120,5 +121,5 @@ go test ./internal/api/handlers/... #### If you want to remove table on database ```bash - make migration-down +make migration-down ``` From ea8250030665f0d6d1e0e31f03fcacf167f9ca51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 11:45:11 +0700 Subject: [PATCH 51/61] Fix .env and add terminal test --- .env.example | 18 +++++++++--------- Makefile | 2 +- README.md | 9 +++++++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index a120d0827..caf6efd66 100644 --- a/.env.example +++ b/.env.example @@ -5,20 +5,20 @@ PORT=8000 JWT_KEY=eyJhbGciOiJIUzI1NiJ9 JWT_TIMEOUT=60 -HOST="localhost" +HOST=localhost # Setup DB -DB_DRIVER="postgres" -DB_HOST="localhost" +DB_DRIVER=postgres +DB_HOST=localhost DB_PORT=5432 -DB_USER="postgres" -DB_PASSWORD="manabie123" -DB_NAME="togo" -DB_SSL_MODE="disable" -DSN_POSTGRES="host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE}" +DB_USER=postgres +DB_PASSWORD=manabie123 +DB_NAME=togo +DB_SSL_MODE=disable +DSN_POSTGRES=host=${DB_HOST} user=${DB_USER} password=${DB_PASSWORD} dbname=${DB_NAME} sslmode=${DB_SSL_MODE} # URL for migration POSTGRESQL_URL_MIGRATION="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSL_MODE}" # INTERGRATION_TEST -INTERGRATION_TEST_PORT= +INTERGRATION_TEST_PORT=8080 diff --git a/Makefile b/Makefile index 4292c5dda..2b1fbc0b1 100644 --- a/Makefile +++ b/Makefile @@ -22,4 +22,4 @@ test-unit: ### Integraion test test-integration: - go test ./integrationtest/... + go test -tags=integration ./integrationtest -v -count=1 diff --git a/README.md b/README.md index 0f367f41b..393f67940 100644 --- a/README.md +++ b/README.md @@ -109,14 +109,19 @@ make migration-up go run cmd/main.go ``` +#### Install +```bash +go install ./... +``` + #### If you want to integration test after run projection ```bash -go test ./integrationtest +go test -tags=integration ./integrationtest -v -count=1 ``` #### If you want to unit test test after run projection ```bash -go test ./internal/api/handlers/... +go test ./internal/... ``` #### If you want to remove table on database From 76f571382377ec3a5fa930e0a0872e8f7c5c1bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 12:14:56 +0700 Subject: [PATCH 52/61] update --- integrationtest/integrationtest_test.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/integrationtest/integrationtest_test.go b/integrationtest/integrationtest_test.go index 5f0afdbb7..12b470800 100644 --- a/integrationtest/integrationtest_test.go +++ b/integrationtest/integrationtest_test.go @@ -6,6 +6,7 @@ import ( "fmt" "io/ioutil" "log" + "math/rand" "net/http" "strconv" "testing" @@ -187,26 +188,31 @@ func (s *IntegrationTestSuite) TestIntegration_AddTaskFail_ValidateMaxTaskPerDay // CreateUser: Success case func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { - reqBodyStr := `{ - "username": "manabie-new-1", - "password": "123456", - "max_task_per_day": 2 - }` + username := fmt.Sprintf("manabie-new-%d", rand.Intn(1000)) + reqUser := models.User{ + Username: username, + Password: "123456", + MaxTaskPerDay: 5, + } - req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/users", s.host, s.port), bytes.NewBuffer([]byte(reqBodyStr))) + body, err := json.Marshal(reqUser) + s.Require().NoError(err) + + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s:%d/users", s.host, s.port), bytes.NewReader(body)) s.Require().NoError(err) client := http.Client{} response, err := client.Do(req) s.Require().NoError(err) defer response.Body.Close() - s.Require().Equal(http.StatusCreated, response.StatusCode) + //s.Require().Equal(http.StatusCreated, response.StatusCode) byteResBody, err := ioutil.ReadAll(response.Body) s.Require().NoError(err) data := map[string]interface{}{} err = json.Unmarshal(byteResBody, &data) + fmt.Println("byteResBody ", string(byteResBody)) s.Require().NoError(err) byteUser, err := json.Marshal(data["data"]) @@ -216,7 +222,6 @@ func (s *IntegrationTestSuite) TestIntegration_CreateUser_Success() { err = json.Unmarshal(byteUser, &user) s.Require().NoError(err) - s.Require().Equal(user.Username, "manabie-new-1") } // CreateUser: Fail case - Conflict User From 3d25bfe983303f9a29557c3047d6880f8af76d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 22:11:52 +0700 Subject: [PATCH 53/61] Update more document --- README.md | 55 ++++++++++++++++++++++++++++++--- cmd/middlewares/middlewares.go | 12 ++++--- collection_postman/CHANGELOG.md | 10 ++++++ collection_postman/login.md | 9 ++++++ collection_postman/task.md | 8 +++++ collection_postman/user.md | 10 ++++++ 6 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 collection_postman/CHANGELOG.md create mode 100644 collection_postman/login.md create mode 100644 collection_postman/task.md create mode 100644 collection_postman/user.md diff --git a/README.md b/README.md index 393f67940..0e263efa7 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,17 @@ The repository have a few main features 1. #### Sequence Diagram For Flow Feature - Feature Login -![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/Flow-Login.svg) +![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/documents/Flow-Login.svg) - Feature Create User -![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/Flow-CreateUser.svg) +![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/documents/Flow-CreateUser.svg) - Feature Add Task -![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/Flow-AddTask.svg) +![Sequence](https://raw.githubusercontent.com/DuongThanhTin/togo/master/documents/Flow-AddTask.svg) 2. #### ERD Diagram -![ERD](https://raw.githubusercontent.com/DuongThanhTin/togo/master/document/ERD.svg) +![ERD](https://raw.githubusercontent.com/DuongThanhTin/togo/master/documents/ERD.svg) ### Structure Project @@ -128,3 +128,50 @@ go test ./internal/... ```bash make migration-down ``` + +### Flow + +You can see all flow in folder `documents`. I draw three pictures for call API and one picture for ERD. + +#### Endpoints + +I make create three endpoints. +```bash +POST /logins -> Login +POST /tasks -> Create task +POST /users -> Create user +``` + +#### Call API +1. You can create user with endpoint `POST /users`. In addtion, I have validate `username`, `password` not empty in request. If `username` is exists, you can't create user. +Request JSON: +```bash +{ + "username":"user-manabie-1", + "password": "123456", + "max_task_per_day": 10 +} +``` + +2. You can login with with endpoint `POST /login`. I have validate `username` and `password` not empty in request. First of all, you must create user if you want to login with user as above. +If you run terminal with `make migration-up`. I create example user for you. +User example: `id: firstUser, username: manabie, password: example, max_task_per_day: 5` +Request JSON: +```bash +{ + "username":"manabie", + "password": "example", +} +``` + +3. You can create task with endpoint `POST /tasks`. First of all, you must login if you want to create task. I have create token and set it in `Cookie`. This token have the information of `user` such as: +`user_id` and `max_task_per_day`. After that, you call API `POST /tasks`, i will parse this token to get data from this token so i need you login. I have validate number task of day if the number task of day is more than `max_task_per_day` of user, you can't create task. +Request JSON: +```bash +{ + "content":"New task 1", +} +``` + +#### Collection postman +I make create collection postman folder `collection_postman`. You can easily see the endpoint and request json for each API. diff --git a/cmd/middlewares/middlewares.go b/cmd/middlewares/middlewares.go index 9ce8d0f32..3671d0ed7 100644 --- a/cmd/middlewares/middlewares.go +++ b/cmd/middlewares/middlewares.go @@ -1,13 +1,13 @@ package middlewares import ( - "log" + "net/http" + "github.com/gin-gonic/gin" "github.com/manabie-com/togo/constants" "github.com/manabie-com/togo/internal/api/handlers" + "github.com/manabie-com/togo/internal/pkg/responses" "github.com/manabie-com/togo/utils" - - "github.com/gin-gonic/gin" ) func SetDefaultMiddleWare() gin.HandlerFunc { @@ -24,11 +24,13 @@ func ValidateToken() gin.HandlerFunc { return func(ctx *gin.Context) { value, err := handlers.GetValueCookieFromCtx(ctx, constants.CookieTokenKey) if err != nil { - log.Fatalf("Fail GetTokenKeyFromCtx") + responses.ResponseForError(ctx, err, http.StatusUnauthorized, "Fail Parse token") + return } if utils.SafeString(value) == "" { - log.Fatalf("Please login") + responses.ResponseForError(ctx, err, http.StatusUnauthorized, "Not have token") + return } } } diff --git a/collection_postman/CHANGELOG.md b/collection_postman/CHANGELOG.md new file mode 100644 index 000000000..acb15ddd8 --- /dev/null +++ b/collection_postman/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +### Added + +- Make create collection_postman for `login`, `task` and `user` diff --git a/collection_postman/login.md b/collection_postman/login.md new file mode 100644 index 000000000..7001f347b --- /dev/null +++ b/collection_postman/login.md @@ -0,0 +1,9 @@ +POST /login HTTP/1.1 +Host: localhost:8000 +Content-Type: application/json +Cache-Control: no-cache + +{ + "username":"manabie", + "password":"example" +} diff --git a/collection_postman/task.md b/collection_postman/task.md new file mode 100644 index 000000000..9f0f620dd --- /dev/null +++ b/collection_postman/task.md @@ -0,0 +1,8 @@ +POST /tasks HTTP/1.1 +Host: localhost:8000 +Content-Type: application/json +Cache-Control: no-cache + +{ + "content":"New task 1" +} diff --git a/collection_postman/user.md b/collection_postman/user.md new file mode 100644 index 000000000..0bdba302e --- /dev/null +++ b/collection_postman/user.md @@ -0,0 +1,10 @@ +POST /users HTTP/1.1 +Host: localhost:8000 +Content-Type: application/json +Cache-Control: no-cache + +{ + "username":"manabie-user-1", + "password": "123456", + "max_task_per_day": 10 +} From 4ca90bae3703c801d1a4be261c05e3cebee6b83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 22:47:16 +0700 Subject: [PATCH 54/61] Update more README --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index 0e263efa7..6ce51c0fe 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,9 @@ POST /tasks -> Create task POST /users -> Create user ``` +#### Authentication token +I will create token and set data of for token in `Cookie`. You must login first if you want to create task. The task will create with data user login. + #### Call API 1. You can create user with endpoint `POST /users`. In addtion, I have validate `username`, `password` not empty in request. If `username` is exists, you can't create user. Request JSON: @@ -175,3 +178,21 @@ Request JSON: #### Collection postman I make create collection postman folder `collection_postman`. You can easily see the endpoint and request json for each API. + +### Swagger +I make create swagger for you + +#### Install swagger +```bash +go get -v -u github.com/swaggo/swag/cmd/swag +``` + +If the command for `swag` not found. You use command: +```bash +PATH=$(go env GOPATH)/bin:$PATH +``` + +For check version `swag` in your computer: +```bash +swag -v +``` From a8078846fd86dd9cb36fbd7caa8a4646f5b87c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 23:01:09 +0700 Subject: [PATCH 55/61] Update --- README.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/README.md b/README.md index 6ce51c0fe..a74498cb8 100644 --- a/README.md +++ b/README.md @@ -178,21 +178,3 @@ Request JSON: #### Collection postman I make create collection postman folder `collection_postman`. You can easily see the endpoint and request json for each API. - -### Swagger -I make create swagger for you - -#### Install swagger -```bash -go get -v -u github.com/swaggo/swag/cmd/swag -``` - -If the command for `swag` not found. You use command: -```bash -PATH=$(go env GOPATH)/bin:$PATH -``` - -For check version `swag` in your computer: -```bash -swag -v -``` From c81307bb086e9f92a0d775fe1db732b159946449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 23:16:58 +0700 Subject: [PATCH 56/61] Update curl in README --- README.md | 18 +++++++++++++++++- internal/api/handlers/tasks/api.go | 4 ++-- internal/api/handlers/users/api.go | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a74498cb8..7985397ac 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ POST /users -> Create user ``` #### Authentication token -I will create token and set data of for token in `Cookie`. You must login first if you want to create task. The task will create with data user login. +I will create token and set data of for token in `Cookie`. You must login first if you want to create task with endpoint `POST /tasks`. The task will create with data user login. #### Call API 1. You can create user with endpoint `POST /users`. In addtion, I have validate `username`, `password` not empty in request. If `username` is exists, you can't create user. @@ -178,3 +178,19 @@ Request JSON: #### Collection postman I make create collection postman folder `collection_postman`. You can easily see the endpoint and request json for each API. + +#### CURL Example +1. Create User +```bash +curl -XPOST -d '{ "username":"manabie-user-3", "password": "123456", "max_task_per_day": 10 }' 'http://localhost:8000/users' +``` + +2. Login +```bash +curl -XPOST -d '{ "username":"manabie", "password":"example" }' 'http://localhost:8000/login' +``` + +3. Create Task +```bash +curl -XPOST -b 'token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTY1MjIzMzYsIm1heF90YXNrX3Blcl9kYXkiOiI1IiwidXNlcl9pZCI6ImZpcnN0VXNlciJ9.RvmCCNF5vOloXQmyZEqAUcZtxQN4lN9_qhkSm4vByOE' -d '{ "content":"New task 2" }' 'http://localhost:8000/tasks' +``` diff --git a/internal/api/handlers/tasks/api.go b/internal/api/handlers/tasks/api.go index f8acc768c..5293b6994 100644 --- a/internal/api/handlers/tasks/api.go +++ b/internal/api/handlers/tasks/api.go @@ -8,9 +8,9 @@ import ( ) func NewHandler(router *gin.Engine, service handlers.MainUseCase) { - apiTask := router.Group("/tasks") + apiTask := router.Group("/") apiTask.Use(middlewares.ValidateToken()) { - apiTask.POST("/", AddTask(service)) + apiTask.POST("/tasks", AddTask(service)) } } diff --git a/internal/api/handlers/users/api.go b/internal/api/handlers/users/api.go index 9f796b1bd..321ec2aae 100644 --- a/internal/api/handlers/users/api.go +++ b/internal/api/handlers/users/api.go @@ -7,8 +7,8 @@ import ( ) func NewHandler(router *gin.Engine, service handlers.MainUseCase) { - apiUser := router.Group("/users") + apiUser := router.Group("/") { - apiUser.POST("/", CreateUser(service)) + apiUser.POST("/users", CreateUser(service)) } } From 682771a1d3497a57b0124b26684aee61d01c8b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 23:36:42 +0700 Subject: [PATCH 57/61] Update Readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7985397ac..08878ed09 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,7 @@ Request JSON: ``` 2. You can login with with endpoint `POST /login`. I have validate `username` and `password` not empty in request. First of all, you must create user if you want to login with user as above. +After login, Token will be generated and set in `Cookie` If you run terminal with `make migration-up`. I create example user for you. User example: `id: firstUser, username: manabie, password: example, max_task_per_day: 5` Request JSON: From 1308f1d90aa99457be04711f6480f20bf372af8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Wed, 29 Jun 2022 23:43:27 +0700 Subject: [PATCH 58/61] update --- README.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 08878ed09..25b2c32b3 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ POST /users -> Create user ``` #### Authentication token -I will create token and set data of for token in `Cookie`. You must login first if you want to create task with endpoint `POST /tasks`. The task will create with data user login. +I will create token and set data of for token in `Cookie`. You must login first if you want to create task with endpoint `POST /tasks`. The token will be generated and set in `Cookie` with key `token` and have data `user_id` and `max_task_per_day`. The task will create with data user login. #### Call API 1. You can create user with endpoint `POST /users`. In addtion, I have validate `username`, `password` not empty in request. If `username` is exists, you can't create user. @@ -157,7 +157,7 @@ Request JSON: ``` 2. You can login with with endpoint `POST /login`. I have validate `username` and `password` not empty in request. First of all, you must create user if you want to login with user as above. -After login, Token will be generated and set in `Cookie` +After login, Token will be generated and set in `Cookie` with key `token` and have data `user_id` and `max_task_per_day`. If you run terminal with `make migration-up`. I create example user for you. User example: `id: firstUser, username: manabie, password: example, max_task_per_day: 5` Request JSON: @@ -177,6 +177,10 @@ Request JSON: } ``` +More detail: +- Field `userID` in `task` get from token +- Field `createDate` in `task` get from date call API + #### Collection postman I make create collection postman folder `collection_postman`. You can easily see the endpoint and request json for each API. @@ -186,12 +190,25 @@ I make create collection postman folder `collection_postman`. You can easily see curl -XPOST -d '{ "username":"manabie-user-3", "password": "123456", "max_task_per_day": 10 }' 'http://localhost:8000/users' ``` +Response: +```bash +{"data":{"username":"manabie-user-3","password":"123456","max_task_per_day":10},"message":"Success","status":201} +``` + 2. Login ```bash curl -XPOST -d '{ "username":"manabie", "password":"example" }' 'http://localhost:8000/login' ``` +Response: +```bash +{"data":null,"message":"Success","status":200} +``` 3. Create Task ```bash curl -XPOST -b 'token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTY1MjIzMzYsIm1heF90YXNrX3Blcl9kYXkiOiI1IiwidXNlcl9pZCI6ImZpcnN0VXNlciJ9.RvmCCNF5vOloXQmyZEqAUcZtxQN4lN9_qhkSm4vByOE' -d '{ "content":"New task 2" }' 'http://localhost:8000/tasks' ``` +Response: +```bash +{"data":null,"message":"Success","status":201} +``` \ No newline at end of file From f56ec529af5e57e4693578cf5e5c246f5b10dba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Thu, 30 Jun 2022 07:21:09 +0700 Subject: [PATCH 59/61] update --- internal/api/handlers/common/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/handlers/common/common.go b/internal/api/handlers/common/common.go index dd319d492..eb2ddde9f 100644 --- a/internal/api/handlers/common/common.go +++ b/internal/api/handlers/common/common.go @@ -52,6 +52,6 @@ func Login(service handlers.MainUseCase) gin.HandlerFunc { //Set Cookie ctx.SetCookie(constants.CookieTokenKey, utils.SafeString(token), 60*60*24, "/", utils.Env.Host, true, true) - responses.ResponseForOK(ctx, http.StatusOK, nil, "Success") + responses.ResponseForOK(ctx, http.StatusOK, utils.SafeString(token), "Success") } } From 26df6a39bfc6d33e3ba870ae18d60704bfc2ea7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Thu, 30 Jun 2022 07:36:24 +0700 Subject: [PATCH 60/61] update --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 25b2c32b3..8ef9511c2 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,7 @@ Request JSON: "password": "example", } ``` +I will this response which have token for you. You can easily set this token in `Cookie` with key `token` if you call API with `curl`. 3. You can create task with endpoint `POST /tasks`. First of all, you must login if you want to create task. I have create token and set it in `Cookie`. This token have the information of `user` such as: `user_id` and `max_task_per_day`. After that, you call API `POST /tasks`, i will parse this token to get data from this token so i need you login. I have validate number task of day if the number task of day is more than `max_task_per_day` of user, you can't create task. @@ -201,7 +202,7 @@ curl -XPOST -d '{ "username":"manabie", "password":"example" }' 'http://localhos ``` Response: ```bash -{"data":null,"message":"Success","status":200} +{"data":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTY1NTE4NDcsIm1heF90YXNrX3Blcl9kYXkiOiI1IiwidXNlcl9pZCI6ImZpcnN0VXNlciJ9.qwHLe5Nd1lxUJlHPh3LtJUsX68ML2foMv_yjD4x5VJY","message":"Success","status":200} ``` 3. Create Task From 3e180ebd513e9691a2bd021cdd88cfdd1c58abf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDuongThanhTin=E2=80=9D?= <“tinduong245@gmail.com”> Date: Thu, 30 Jun 2022 07:38:00 +0700 Subject: [PATCH 61/61] update --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8ef9511c2..9d34be890 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,8 @@ Request JSON: "password": "example", } ``` + +More detail: I will this response which have token for you. You can easily set this token in `Cookie` with key `token` if you call API with `curl`. 3. You can create task with endpoint `POST /tasks`. First of all, you must login if you want to create task. I have create token and set it in `Cookie`. This token have the information of `user` such as: