diff --git a/apis/middlewares.go b/apis/middlewares.go index 1c2285ae..2c44d09b 100644 --- a/apis/middlewares.go +++ b/apis/middlewares.go @@ -77,7 +77,7 @@ func RequireAdminAuth() echo.MiddlewareFunc { } } -// RequireAdminAuthIfAny middleware requires a request to have +// RequireAdminAuthOnlyIfAny middleware requires a request to have // a valid admin Authorization header set (aka. `Authorization: Admin ...`) // ONLY if the application has at least 1 existing Admin model. func RequireAdminAuthOnlyIfAny(app core.App) echo.MiddlewareFunc { diff --git a/daos/base.go b/daos/base.go index 5c0a2bf5..73d4a16e 100644 --- a/daos/base.go +++ b/daos/base.go @@ -115,9 +115,8 @@ func (dao *Dao) Delete(m models.Model) error { } } - deleteErr := dao.db.Model(m).Delete() - if deleteErr != nil { - return deleteErr + if err := dao.db.Model(m).Delete(); err != nil { + return err } if dao.AfterDeleteFunc != nil { @@ -162,8 +161,7 @@ func (dao *Dao) update(m models.Model) error { return err } } else { - err := dao.db.Model(m).Update() - if err != nil { + if err := dao.db.Model(m).Update(); err != nil { return err } } @@ -203,8 +201,7 @@ func (dao *Dao) create(m models.Model) error { return err } } else { - err := dao.db.Model(m).Insert() - if err != nil { + if err := dao.db.Model(m).Insert(); err != nil { return err } } diff --git a/daos/param.go b/daos/param.go index c17a9c79..23ba07dd 100644 --- a/daos/param.go +++ b/daos/param.go @@ -40,7 +40,7 @@ func (dao *Dao) SaveParam(key string, value any, optEncryptionKey ...string) err param = &models.Param{Key: key} } - var normalizedValue any + normalizedValue := value // encrypt if optEncryptionKey is set if len(optEncryptionKey) > 0 && optEncryptionKey[0] != "" { @@ -55,8 +55,6 @@ func (dao *Dao) SaveParam(key string, value any, optEncryptionKey ...string) err } normalizedValue = encryptVal - } else { - normalizedValue = value } encodedValue := types.JsonRaw{} diff --git a/tools/filesystem/filesystem.go b/tools/filesystem/filesystem.go index 1dd8b78a..d8ef3203 100644 --- a/tools/filesystem/filesystem.go +++ b/tools/filesystem/filesystem.go @@ -153,7 +153,7 @@ func (s *System) DeletePrefix(prefix string) []error { // (this operation usually is optional and there is no need to strictly check the result) // --- // fill dirs slice - dirs := []string{} + dirs := make([]string, 0, len(dirsMap)) for d := range dirsMap { dirs = append(dirs, d) } diff --git a/tools/inflector/inflector.go b/tools/inflector/inflector.go index f4b45243..3fa1ab13 100644 --- a/tools/inflector/inflector.go +++ b/tools/inflector/inflector.go @@ -32,15 +32,14 @@ func Sentenize(str string) string { return "" } - s := []rune(str) - sentence := string(unicode.ToUpper(s[0])) + string(s[1:]) + str = UcFirst(str) - lastChar := string(s[len(s)-1:]) + lastChar := str[len(str)-1:] if lastChar != "." && lastChar != "?" && lastChar != "!" { - return sentence + "." + return str + "." } - return sentence + return str } // Sanitize sanitizes `str` by removing all characters satisfying `removePattern`. diff --git a/tools/inflector/inflector_test.go b/tools/inflector/inflector_test.go index 8a768ddb..a4d21223 100644 --- a/tools/inflector/inflector_test.go +++ b/tools/inflector/inflector_test.go @@ -12,6 +12,7 @@ func TestUcFirst(t *testing.T) { expected string }{ {"", ""}, + {" ", " "}, {"Test", "Test"}, {"test", "Test"}, {"test test2", "Test test2"}, @@ -55,6 +56,9 @@ func TestSentenize(t *testing.T) { }{ {"", ""}, {" ", ""}, + {".", "."}, + {"?", "?"}, + {"!", "!"}, {"Test", "Test."}, {" test ", "Test."}, {"hello world", "Hello world."},