Update makefile

.gitignore

@@ -1,4 +1,5 @@
 /.vscode
 /__debug*
+/build
 /tmp
 /config.yaml

Makefile

@@ -1,2 +1,8 @@
+EXEC=iris-test
+
 run:
 	@air
+
+.PHONY: build
+build:
+	@go build -ldflags "-s -w" -o ./build/${EXEC} ./app/main.go

README.md

@@ -11,3 +11,48 @@
   - [Source](https://github.com/CloudyKit/jet)
   - [Syntax reference](https://github.com/CloudyKit/jet/blob/master/docs/syntax.md)
 
+## Howto
+
+- [Password Hashing (bcrypt)](https://gowebexamples.com/password-hashing/)
+
+
+## Bombardier benchmark
+
+Pandora - Jet templating engine
+
+```
+eden@pandora:[~/apps/sandbox/golang/iris-web-framework]: bombardier -c 100 -d 10s -l http://localhost:8000                                ±[A1][main]
+Bombarding http://localhost:8000 for 10s using 100 connection(s)
+Done!
+Statistics        Avg      Stdev        Max
+  Reqs/sec     10542.16    2631.23   17296.86
+  Latency        9.50ms     3.22ms    42.93ms
+  Latency Distribution
+     50%     8.77ms
+     75%    11.86ms
+     90%    15.31ms
+     95%    17.86ms
+     99%    23.90ms
+  HTTP codes:
+    1xx - 0, 2xx - 105258, 3xx - 0, 4xx - 0, 5xx - 0
+    others - 0
+  Throughput:    28.08MB/s
+```
+```
+eden@pandora:[~/apps/sandbox/golang/iris-web-framework]: bombardier -c 100 -d 10s -l http://localhost:8000/users                          ±[A1][main]
+Bombarding http://localhost:8000/users for 10s using 100 connection(s)
+Done!
+Statistics        Avg      Stdev        Max
+  Reqs/sec      1096.26     427.09    3211.54
+  Latency       91.08ms    80.06ms   471.41ms
+  Latency Distribution
+     50%    78.37ms
+     75%   156.58ms
+     90%   191.60ms
+     95%   223.49ms
+     99%   309.59ms
+  HTTP codes:
+    1xx - 0, 2xx - 11060, 3xx - 0, 4xx - 0, 5xx - 0
+    others - 0
+  Throughput:    19.91MB/s
+```

app/common/config.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"fmt"

app/common/db.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"fmt"

app/common/logging.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"encoding/json"

app/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"iris-test/app/common"
 	"iris-test/app/views"
 	"os"
 	"time"
@@ -15,32 +16,32 @@ import (
 var redisDB *redis.Database
 
 func createSessionEngine() *sessions.Sessions {
-	redisAddr := fmt.Sprintf("%s:%d", Config.Redis.Host, Config.Redis.Port)
+	redisAddr := fmt.Sprintf("%s:%d", common.Config.Redis.Host, common.Config.Redis.Port)
 
 	redisDB = redis.New(redis.Config{
 		Network:   "tcp",
 		Addr:      redisAddr,
 		Timeout:   time.Duration(30) * time.Second,
 		MaxActive: 10,
-		Username:  Config.Redis.Username,
+		Username:  common.Config.Redis.Username,
-		Password:  Config.Redis.Password,
+		Password:  common.Config.Redis.Password,
-		Database:  Config.Redis.Database,
+		Database:  common.Config.Redis.Database,
-		Prefix:    Config.Redis.Prefix,
+		Prefix:    common.Config.Redis.Prefix,
 		Driver:    redis.GoRedis(), // defaults to this driver.
 		// To set a custom, existing go-redis client, use the "SetClient" method:
 		// Driver: redis.GoRedis().SetClient(customGoRedisClient)
 	})
 
-	sessions_engine := sessions.New(sessions.Config{
+	sessionsEngine := sessions.New(sessions.Config{
 		Cookie:          "_session_id",
 		Expires:         0, // defaults to 0: unlimited life. Another good value is: 45 * time.Minute,
 		AllowReclaim:    true,
 		CookieSecureTLS: true,
 	})
 
-	sessions_engine.UseDatabase(redisDB)
+	sessionsEngine.UseDatabase(redisDB)
 
-	return sessions_engine
+	return sessionsEngine
 }
 
 func createAccessLog() *accesslog.AccessLog {
@@ -83,7 +84,7 @@ func createApp() *iris.Application {
 	accessLog := createAccessLog()
 
 	app := iris.New()
-	app.Logger().SetLevel(Config.Application.LogLevel)
+	app.Logger().SetLevel(common.Config.Application.LogLevel)
 	app.Use(sessionsEngine.Handler())
 	app.UseRouter(accessLog.Handler)
 	app.RegisterView(iris.Jet("./app/templates", ".jet").Reload(true))
@@ -92,9 +93,9 @@ func createApp() *iris.Application {
 }
 
 func main() {
-	InitCfg()
+	common.InitCfg()
-	InitLogging()
+	common.InitLogging()
-	InitDB()
+	common.InitDB()
 
 	app := createApp()
 	defer redisDB.Close()

app/models/user.go

@@ -1,6 +1,8 @@
 package models
 
-import "time"
+import (
+	"time"
+)
 
 type User struct {
 	Id        string `gorm:"type(uuid);unique"`
@@ -16,3 +18,9 @@ type User struct {
 func (u *User) TableName() string {
 	return "users"
 }
+
+// func (u *User) SetPassword(password string) (string, error) {
+// 	secretKey := Config.Application.SecretKey
+// 	bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14)
+// 	return string(bytes), err
+// }

app/repository/users.go

@@ -12,6 +12,7 @@ type UsersRepository struct {
 }
 
 type UserFilter struct {
+	Id       *string
 	IsActive *bool
 }
 
@@ -22,9 +23,14 @@ func CreateUsersRepository(db *gorm.DB) *UsersRepository {
 func applyFilter(db *gorm.DB, filter *UserFilter) *gorm.DB {
 	query := db
 
-	// if filter.State != "" {
+	if filter.Id != nil {
-	// 	query = query.Where("state = ?", filter.State)
+		query = query.Where("id = ?", filter.Id)
-	// }
+	}
+
+	if filter.IsActive != nil {
+		query = query.Where(map[string]interface{}{"is_active": filter.IsActive})
+	}
+
 	// if filter.SendAt_lt != nil {
 	// 	query = query.Where("send_at < ?", filter.SendAt_lt)
 	// }
@@ -69,3 +75,18 @@ func (repository *UsersRepository) List(filter *UserFilter, pagination *Paginati
 
 	return &users
 }
+
+func (repository *UsersRepository) Get(filter *UserFilter) *models.User {
+	var user models.User
+
+	query := repository.db.Model(&models.User{})
+	query = applyFilter(query, filter)
+	query.First(&user)
+
+	return &user
+}
+
+func (repository *UsersRepository) Save(user *models.User) *models.User {
+	repository.db.Save(user)
+	return user
+}

app/templates/base/base.jet

@@ -10,14 +10,20 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css">
 </head>
 <body>
-    <div class="container">
+    <div class="container mt-3">
         <h1>{{ title }}</h1>
 
-        <p>
+        <ul class="nav">
-            <a href="/">Frontpage</a>
+            <li class="nav-item">
-            <a href="/users">Users</a>
+                <a href="/" class="nav-link">Frontpage</a>
-            <a href="/about">About</a>
+            </li>
-        </p>
+            <li class="nav-item">
+                <a href="/users" class="nav-link">Users</a>
+            </li>
+            <li class="nav-item">
+                <a href="/about" class="nav-link">About</a>
+            </li>
+        </ul>
 
         <main>
             {{ yield mainContent() }}

app/templates/components/table_component.jet

@@ -1,10 +1,19 @@
 {{ block usersTable(users) }}
-    <p>blablabla</p>
+    <table class="table table-hover">
-
+        <thead>
-    <table class="table">
+            <tr>
+                <th>ID</th>
+                <th>First name</th>
+                <th>Last name</th>
+                <th>Email</th>
+            </tr>
+        </thead>
         <tbody>
             {{ range users }}
                 <tr>
+                    <td>
+                        <a href="/users/{{ .Id }}">{{ .Id }}</a>
+                    </td>
                     <td>{{ .FirstName }}</td>
                     <td>{{ .LastName }}</td>
                     <td>{{ .Email }}</td>

app/templates/pages/user-edit.jet

@@ -0,0 +1,35 @@
+{{ extends "/base/base.jet" }}
+{{ import "/components/table_component.jet" }}
+
+
+{{ block mainContent() }}
+    <h3>Edit user</h3>
+
+
+    <div class="row">
+        <form class="mb-5 col-4 ms-auto me-auto" method="post" action="{{ .currentPath }}">
+            <div class="mb-3">
+                <label class="form-label">First name</label>
+                <input type="text" name="first-name" class="form-control" value="{{ user.FirstName }}" required>
+            </div>
+            <div class="mb-3">
+                <label class="form-label">Last name</label>
+                <input type="text" name="last-name" class="form-control" value="{{ user.LastName }}" required>
+            </div>
+            <div class="mb-3">
+                <label class="form-label">Email</label>
+                <input type="email" name="email" class="form-control" value="{{ user.Email }}" required>
+            </div>
+
+            <div class="d-flex">
+                <a href="/users" class="btn btn-outline-secondary ms-auto me-2">
+                    Cancel
+                </a>
+                <button type="submit" class="btn btn-success">
+                    Save
+                </button>
+            </div>
+        </form>
+    </div>
+
+{{ end }}

app/templates/pages/users.jet

@@ -3,13 +3,7 @@
 
 
 {{ block mainContent() }}
-    <ul>
+    <h3>Users</h3>
-        {{ range params1 }}
-            <li>{{ . }}</li>
-        {{ end }}
-    </ul>
-
-    <h3>{{ title }}</h3>
 
     {{ yield usersTable(users=users) }}
 {{ end }}

app/views/router.go

@@ -7,5 +7,8 @@ func CreateRouter(app *iris.Application) {
 	app.Post("/", PostIndexPage)
 
 	app.Get("/users", GetUsersPage)
+	app.Get("/users/{userId:uuid}", EditUserPage)
+	app.Post("/users/{userId:uuid}", SaveUserPage)
+
 	app.Get("/about", GetAboutPage)
 }

app/views/users.go

@@ -6,10 +6,13 @@ import (
 	"github.com/kataras/iris/v12"
 )
 
-func GetUsersPage(ctx iris.Context) {
+type editUserForm struct {
-	params1 := []string{"param 1", "param 2", "param 3"}
+	FirstName string `form:"first-name"`
-	ctx.ViewData("params1", params1)
+	LastName  string `form:"last-name"`
+	Email     string `form:"email"`
+}
 
+func GetUsersPage(ctx iris.Context) {
 	userRepository := repository.Dao.UsersRepository
 
 	pagination := repository.NewPagination()
@@ -18,7 +21,8 @@ func GetUsersPage(ctx iris.Context) {
 		repository.NewOrdering("last_name", repository.ORDERING_ASC),
 	}
 
-	users := userRepository.List(&repository.UserFilter{}, &pagination, &ordering)
+	isActive := true
+	users := userRepository.List(&repository.UserFilter{IsActive: &isActive}, &pagination, &ordering)
 
 	ctx.ViewData("users", users)
 
@@ -27,3 +31,42 @@ func GetUsersPage(ctx iris.Context) {
 		return
 	}
 }
+
+func EditUserPage(ctx iris.Context) {
+	userId := ctx.Params().Get("userId")
+	userRepository := repository.Dao.UsersRepository
+
+	filter := repository.UserFilter{Id: &userId}
+	user := userRepository.Get(&filter)
+
+	ctx.ViewData("user", user)
+	ctx.ViewData("currentPath", ctx.Path())
+
+	if err := ctx.View("pages/user-edit.jet"); err != nil {
+		showError(ctx, err)
+		return
+	}
+}
+
+func SaveUserPage(ctx iris.Context) {
+	var form editUserForm
+	err := ctx.ReadForm(&form)
+	if err != nil {
+		ctx.StopWithError(iris.StatusBadRequest, err)
+		return
+	}
+
+	userId := ctx.Params().Get("userId")
+	userRepository := repository.Dao.UsersRepository
+
+	filter := repository.UserFilter{Id: &userId}
+	user := userRepository.Get(&filter)
+
+	user.FirstName = form.FirstName
+	user.LastName = form.LastName
+	user.Email = form.Email
+
+	userRepository.Save(user)
+
+	ctx.Redirect("/users")
+}