Merge pull request #13 from ockibagusp/branch

fix master

Author: ockibagusp

README.md

@@ -37,7 +37,7 @@ file: golang-website-example.sql -> new database: golang-website-example_test
 This using [router](https://github.com/ockibagusp/golang-website-example/blob/master/router/router.go).
 
 ## httpexpect: Test for Debug
-This using [debug](https://github.com/ockibagusp/golang-website-example/blob/master/test/main_test.go).
+This using [debug](https://github.com/ockibagusp/golang-website-example/blob/master/tests/main_test.go).
 
 Optional. Default value @debug: {true} or {1}.
 
@@ -96,13 +96,13 @@ $ go build
 #### Test the packages
 
 ```
-$ go test github.com/ockibagusp/golang-website-example/test 
+$ go test github.com/ockibagusp/golang-website-example/tests 
 ```
 
 or, verbose output (-v) flag:
 
 ```
-$ go test github.com/ockibagusp/golang-website-example/test -v
+$ go test github.com/ockibagusp/golang-website-example/tests -v
 ```
 
 
@@ -113,9 +113,12 @@ $ go test github.com/ockibagusp/golang-website-example/test -v
     Restore | Delete Permanently
 
 - Admin user button: delete not for admin
+- Admin user search
 - mock unit test
 - list pagination with next, previous, first and last
+- moves files function Server and NewServer, etc.
 - Mutex: BankAccount
+- docker
 - too much
 
 ## Operating System (with me)

controllers/user_controller.go

@@ -51,11 +51,14 @@ func (controller *Controller) Users(c echo.Context) error {
 		return c.Redirect(http.StatusFound, fmt.Sprintf("/users/read/%v", user.ID))
 	}
 
-	var users []models.User
-	var err error
+	var (
+		users []models.User
+		err   error
+
+		// typing: all, admin and user
+		typing string
+	)
 
-	// typing: all, admin and user
-	var typing string
 	if c.QueryParam("admin") == "all" {
 		log.Infof(`for GET to users admin models.User{}.FindAll(db, "admin")`)
 		typing = "Admin"
@@ -305,7 +308,7 @@ func (controller *Controller) ReadUser(c echo.Context) error {
 			"for GET to read user without models.User{}.FirstByID() errors: `%v`", err,
 		)
 		log.Warn("END request method GET for read user: [-]failure")
-		// HTTP response status: 405 Method Not Allowed
+		// HTTP response status: 406 Method Not Acceptable
 		return c.HTML(http.StatusNotAcceptable, err.Error())
 	}
 
@@ -370,7 +373,11 @@ func (controller *Controller) UpdateUser(c echo.Context) error {
 	// admin: yes
 	// (IsUser and (not user.Username)): 403 Forbidden
 	if middleware.IsUser(is_auth_type) && (user.Username != session.Values["username"]) {
-		log.Warn("IsUser and (not user.Username): 403 Forbidden")
+		log.Warnf(
+			"IsUser (%v) and [not user.Username (%v)]: 403 Forbidden",
+			middleware.IsUser(is_auth_type),
+			(user.Username != session.Values["username"]),
+		)
 		log.Warn("END request method GET for update user: [-]failure")
 		return c.HTML(http.StatusForbidden, "403 Forbidden")
 	}
@@ -508,15 +515,13 @@ func (controller *Controller) UpdateUserByPassword(c echo.Context) error {
 		controller.DB, id, session.Values["username"].(string),
 	)
 
-	if !middleware.IsAdmin(is_auth_type) {
-		if err != nil {
-			log.Warnf(
-				"for GET to update user by password without models.User{}.FirstByIDAndUsername() errors: `%v`", err,
-			)
-			log.Warn("END request method GET for update user by password: [-]failure")
-			// HTTP response status: 403 Forbidden
-			return c.HTML(http.StatusForbidden, err.Error())
-		}
+	if middleware.IsUser(is_auth_type) && err != nil {
+		log.Warnf(
+			"for GET to update user by password without models.User{}.FirstByIDAndUsername() errors: `%v`", err,
+		)
+		log.Warn("END request method GET for update user by password: [-]failure")
+		// HTTP response status: 403 Forbidden
+		return c.HTML(http.StatusForbidden, err.Error())
 	}
 
 	if c.Request().Method == "POST" {
@@ -527,8 +532,11 @@ func (controller *Controller) UpdateUserByPassword(c echo.Context) error {
 			ConfirmNewPassword: c.FormValue("confirm_new_password"),
 		}
 
-		if !middleware.IsAdmin(is_auth_type) && !middleware.CheckHashPassword(user.Password, _newPasswordForm.OldPassword) {
-			log.Warnf("for POST to update user by password without !middleware.CheckHashPassword() errors: `%v`", err)
+		if !middleware.CheckHashPassword(user.Password, _newPasswordForm.OldPassword) {
+			log.Warnf(
+				"for POST to update user by password without check hash password (%v): 403 Forbidden",
+				middleware.CheckHashPassword(user.Password, _newPasswordForm.OldPassword),
+			)
 			middleware.SetFlashError(c, "check hash password is wrong!")
 			log.Warn("END request method POST for update user by password: [-]failure")
 			return c.Render(http.StatusForbidden, "user-view-password.html", echo.Map{

db/db.go

@@ -14,7 +14,7 @@ var connection *gorm.DB
 var db *sql.DB
 var err error
 
-// Init: new database
+// Init: new database ["PROD" or "DEV"]
 func Init(env string) *gorm.DB {
 	var connectString string
 	configuration := config.GetConfig()

models/user.go

@@ -30,19 +30,19 @@ type UserCity struct {
  */
 
 // User: FindAll(db, admin_or_user={admin, user})
-func (User) FindAll(db *gorm.DB, admin_or_user ...string) ([]User, error) {
+func (user User) FindAll(db *gorm.DB, admin_or_user ...string) ([]User, error) {
 	users := []User{}
 
 	var err error
 
 	// same,
-	// if len(*admin_or_user) == 0 || len(*admin_or_user) == 1 && (*admin_or_user)[0] == "all" {...}
-	if isAll(&admin_or_user) {
+	// if len(admin_or_user) == 0 || len(admin_or_user) == 1 && admin_or_user[0] == "all" {...}
+	if user.isAll(&admin_or_user) {
 		// Limit: 25 ?
 		err = db.Limit(25).Find(&users).Error
-	} else if isAdmin(&admin_or_user) {
+	} else if user.isAdmin(&admin_or_user) {
 		err = db.Limit(25).Where("is_admin = 1").Find(&users).Error
-	} else if isUser(&admin_or_user) {
+	} else if user.isUser(&admin_or_user) {
 		err = db.Limit(25).Where("is_admin = 0").Find(&users).Error
 	} else { // admin_or_user agrs [2,..]=string
 		return nil, errors.New(`models.User{}.FirstAll: admin_or_user agrs [2]{"admin", "user"}=string`)
@@ -179,14 +179,14 @@ func (user User) Delete(db *gorm.DB, id int) error {
 }
 
 // is? all, admin or user?
-func isAll(admin_or_user *[]string) bool {
+func (User) isAll(admin_or_user *[]string) bool {
 	return len(*admin_or_user) == 0 || len(*admin_or_user) == 1 && (*admin_or_user)[0] == "all"
 }
 
-func isAdmin(admin_or_user *[]string) bool {
+func (User) isAdmin(admin_or_user *[]string) bool {
 	return len(*admin_or_user) == 1 && (*admin_or_user)[0] == "admin"
 }
 
-func isUser(admin_or_user *[]string) bool {
+func (User) isUser(admin_or_user *[]string) bool {
 	return len(*admin_or_user) == 1 && (*admin_or_user)[0] == "user"
 }

template/template.go

@@ -138,7 +138,7 @@ func rootedPathName() (dir string) {
 	}
 
 	// TODO: Linux and MacOS: ok. Windows: ...?
-	regex := regexp.MustCompile("/test$")
+	regex := regexp.MustCompile("/tests$")
 	match := regex.Match([]byte(dir))
 
 	if match {

test/README.md tests/README.mdtest/README.md renamed to tests/README.md

@@ -1,6 +1,6 @@
-### golang-website-example/test
+### golang-website-example/tests
 
-#### Test the packages
+#### Tests the packages
 
 ```
 $ go test

test/about_controller_test.go tests/about_controller_test.gotest/about_controller_test.go renamed to tests/about_controller_test.go

@@ -1,4 +1,4 @@
-package test
+package tests
 
 import (
 	"net/http"

test/controller_test.go tests/controller_test.gotest/controller_test.go renamed to tests/controller_test.go

@@ -1,4 +1,4 @@
-package test
+package tests
 
 import (
 	"net/http"

test/db_test.go tests/db_test.gotest/db_test.go renamed to tests/db_test.go

@@ -1,4 +1,4 @@
-package test
+package tests
 
 import (
 	"testing"

test/home_controller_test.go tests/home_controller_test.gotest/home_controller_test.go renamed to tests/home_controller_test.go

@@ -1,4 +1,4 @@
-package test
+package tests
 
 import (
 	"net/http"