feat(*): adjust some details, specially for xgorm

README.md

@@ -5,7 +5,7 @@
 ### Functions
 
 + **xgin**
-+ **xfiber**
++ xfiber
 + **xgorm**
 + **xredis**
 + xneo4j
@@ -19,7 +19,6 @@
 
 + See [go.mod](./go.mod) and [go.sum](./go.sum)
 + `github.com/Aoi-hosizora/ahlib v1.3.9`
-+ `github.com/Aoi-hosizora/ahlib-more v1.0.0`
 + `github.com/gin-gonic/gin v1.6.3`
 + `github.com/go-playground/validator/v10 v10.2.0`
 + `github.com/gofiber/fiber v1.12.6`

xdto/error.go

@@ -23,7 +23,7 @@ type ErrorDto struct {
 
 // Build a basic dto (only include time, type, detail, request).
 func BuildBasicErrorDto(err interface{}, requests []string) *ErrorDto {
-	return BuildErrorDto(err, requests, -2, false)
+	return BuildErrorDto(err, requests, -1, false)
 }
 
 // Build a complete dto (also include runtime parameters).

xfiber/dump.go

@@ -12,8 +12,8 @@ func DumpRequest(c *fiber.Ctx) []string {
 		return request
 	}
 
-	bytes := c.Fasthttp.Request.String()
-	params := strings.Split(bytes, "\r\n")
+	str := c.Fasthttp.Request.String()
+	params := strings.Split(str, "\r\n")
 	for _, param := range params {
 		if strings.HasPrefix(param, "Authorization:") { // Authorization header
 			request = append(request, "Authorization: *")

xgin/README.md

@@ -11,6 +11,3 @@
 + `EnableRegexpBinding() error`
 + `EnableRFC3339DateBinding() error`
 + `EnableRFC3339DateTimeBinding() error`
-+ `type HandlerFuncW func(c *gin.Context) (int, interface{})`
-+ `JsonW(fn HandlerFuncW) gin.HandlerFunc`
-+ `XmlW(fn HandlerFuncW) gin.HandlerFunc`

xgin/dump.go

@@ -13,8 +13,8 @@ func DumpRequest(c *gin.Context) []string {
 		return request
 	}
 
-	bytes, _ := httputil.DumpRequest(c.Request, false)
-	params := strings.Split(string(bytes), "\r\n")
+	bs, _ := httputil.DumpRequest(c.Request, false)
+	params := strings.Split(string(bs), "\r\n")
 	for _, param := range params {
 		if strings.HasPrefix(param, "Authorization:") { // Authorization header
 			request = append(request, "Authorization: *")

xgin/xgin_test.go

@@ -35,14 +35,3 @@ func TestBuildErrorDto(t *testing.T) {
 	})
 	_ = app.Run(":1234")
 }
-
-func TestW(t *testing.T) {
-	app := gin.New()
-	app.GET("json", JsonW(func(c *gin.Context) (int, interface{}) {
-		return 200, &gin.H{"test": "hello world"}
-	}))
-	app.GET("xml", XmlW(func(c *gin.Context) (int, interface{}) {
-		return 200, &gin.H{"test": "hello world"}
-	}))
-	_ = app.Run(":1234")
-}

xgorm/README.md

@@ -23,6 +23,7 @@
 + `(h *Helper) Create(model interface{}, object interface{}) (xstatus.DbStatus, error)`
 + `(h *Helper) Update(model interface{}, where interface{}, object interface{}) (xstatus.DbStatus, error)`
 + `(h *Helper) Delete(model interface{}, where interface{}, object interface{}) (xstatus.DbStatus, error)`
++ `QueryErr(rdb *gorm.DB) (bool, error)`
 + `CreateDB(rdb *gorm.DB) (xstatus.DbStatus, error)`
 + `UpdateDB(rdb *gorm.DB) (xstatus.DbStatus, error)`
 + `DeleteDB(rdb *gorm.DB) (xstatus.DbStatus, error)`

xgorm/helper.go

@@ -31,28 +31,40 @@ func (h *Helper) Exist(model interface{}, where interface{}) (bool, error) {
 	return cnt > 0, nil
 }
 
+// Through db.Model(model).Create(object).
 func (h *Helper) Create(model interface{}, object interface{}) (xstatus.DbStatus, error) {
 	rdb := h.db.Model(model).Create(object)
-	return CreateDB(rdb)
+	return CreateErr(rdb)
 }
 
+// Through db.Model(model).Where(where).Update(object).
 func (h *Helper) Update(model interface{}, where interface{}, object interface{}) (xstatus.DbStatus, error) {
 	if where == nil {
 		where = object
 	}
 	rdb := h.db.Model(model).Where(where).Update(object)
-	return UpdateDB(rdb)
+	return UpdateErr(rdb)
 }
 
+// Through db.Model(model).Where(where).Delete(object).
 func (h *Helper) Delete(model interface{}, where interface{}, object interface{}) (xstatus.DbStatus, error) {
 	if where == nil {
 		where = object
 	}
 	rdb := h.db.Model(model).Where(where).Delete(object)
-	return DeleteDB(rdb)
+	return DeleteErr(rdb)
 }
 
-func CreateDB(rdb *gorm.DB) (xstatus.DbStatus, error) {
+func QueryErr(rdb *gorm.DB) (bool, error) {
+	if rdb.RecordNotFound() {
+		return false, nil
+	} else if rdb.Error != nil {
+		return false, rdb.Error
+	}
+	return true, nil
+}
+
+func CreateErr(rdb *gorm.DB) (xstatus.DbStatus, error) {
 	if IsMySqlDuplicateEntryError(rdb.Error) {
 		return xstatus.DbExisted, nil
 	} else if rdb.Error != nil || rdb.RowsAffected == 0 {
@@ -62,7 +74,7 @@ func CreateDB(rdb *gorm.DB) (xstatus.DbStatus, error) {
 	return xstatus.DbSuccess, nil
 }
 
-func UpdateDB(rdb *gorm.DB) (xstatus.DbStatus, error) {
+func UpdateErr(rdb *gorm.DB) (xstatus.DbStatus, error) {
 	if IsMySqlDuplicateEntryError(rdb.Error) {
 		return xstatus.DbExisted, nil
 	} else if rdb.Error != nil {
@@ -74,7 +86,7 @@ func UpdateDB(rdb *gorm.DB) (xstatus.DbStatus, error) {
 	return xstatus.DbSuccess, nil
 }
 
-func DeleteDB(rdb *gorm.DB) (xstatus.DbStatus, error) {
+func DeleteErr(rdb *gorm.DB) (xstatus.DbStatus, error) {
 	if rdb.Error != nil {
 		return xstatus.DbFailed, rdb.Error
 	} else if rdb.RowsAffected == 0 {

xneo4j/helper.go

@@ -144,7 +144,7 @@ func GetDuration(data interface{}) neo4j.Duration {
 // Setup cypher orderBy's parent, index starts from 1.
 type OrderByPair map[string]int
 
-// Apply cypher orderBy string through PropertyDict and OrderByPair (using parent pair).
+// Apply cypher orderBy string through xproperty.PropertyDict and xneo4j.OrderByPair (using parent pair).
 func ApplyCypherOrderBy(p xproperty.PropertyDict, pairs OrderByPair) func(source string, parents ...string) string {
 	return func(source string, parents ...string) string {
 		result := make([]string, 0)

xstatus/README.md

@@ -27,11 +27,9 @@
 + `type JwtStatus int8`
 + `JwtSuccess`
 + `JwtExpired`
-+ `JwtNotIssued`
 + `JwtNotValid`
 + `JwtIssuer`
 + `JwtSubject`
-+ `JwtAudience`
 + `JwtInvalid`
 + `JwtUserErr`
 + `JwtFailed`

xstatus/jwt.go

@@ -3,21 +3,22 @@ package xstatus
 type JwtStatus int8
 
 const (
-	JwtSuccess   JwtStatus = iota // success
-	JwtExpired                    // exp, ExpiresAt
-	JwtNotIssued                  // iat, IssuedAt
-	JwtNotValid                   // nbf, NotBefore
-	JwtIssuer                     // iss, Issuer
-	JwtSubject                    // sub, Subject
-	JwtAudience                   // aud, Audience
-	JwtInvalid                    // generic
-	JwtBlank                      // blank
-	JwtNotFound                   // not found
-	JwtUserErr                    // user
-	JwtFailed                     // server error
-	JwtTagA                       // tag a
-	JwtTagB                       // tag b
-	JwtTagC                       // tag c
+	JwtSuccess  JwtStatus = iota // success
+	JwtExpired                   // exp, ExpiresAt
+	JwtNotValid                  // nbf, NotBefore
+	JwtIssuer                    // iss, Issuer
+	JwtSubject                   // sub, Subject
+	JwtInvalid                   // generic
+	JwtBlank                     // blank
+	JwtNotFound                  // not found
+	JwtUserErr                   // user
+	JwtFailed                    // server error
+	JwtTagA                      // tag a
+	JwtTagB                      // tag b
+	JwtTagC                      // tag c
+
+	// JwtNotIssued // iat, IssuedAt
+	// JwtAudience  // aud, Audience
 )
 
 func (j JwtStatus) String() string {
@@ -26,16 +27,12 @@ func (j JwtStatus) String() string {
 		return "jwt-success"
 	case JwtExpired:
 		return "jwt-expired"
-	case JwtNotIssued:
-		return "jwt-not-issued"
 	case JwtNotValid:
 		return "jwt-not-valid"
 	case JwtIssuer:
 		return "jwt-issuer"
 	case JwtSubject:
 		return "jwt-subject"
-	case JwtAudience:
-		return "jwt-audience"
 	case JwtInvalid:
 		return "jwt-invalid"
 	case JwtBlank:

xstatus/xstatus_test.go

@@ -31,11 +31,9 @@ func TestFsmStatus(t *testing.T) {
 func TestJwtStatus(t *testing.T) {
 	xtesting.Equal(t, JwtSuccess.String(), "jwt-success")
 	xtesting.Equal(t, JwtExpired.String(), "jwt-expired")
-	xtesting.Equal(t, JwtNotIssued.String(), "jwt-not-issued")
 	xtesting.Equal(t, JwtNotValid.String(), "jwt-not-valid")
 	xtesting.Equal(t, JwtIssuer.String(), "jwt-issuer")
 	xtesting.Equal(t, JwtSubject.String(), "jwt-subject")
-	xtesting.Equal(t, JwtAudience.String(), "jwt-audience")
 	xtesting.Equal(t, JwtInvalid.String(), "jwt-invalid")
 	xtesting.Equal(t, JwtBlank.String(), "jwt-blank")
 	xtesting.Equal(t, JwtNotFound.String(), "jwt-not-found")
@@ -44,4 +42,5 @@ func TestJwtStatus(t *testing.T) {
 	xtesting.Equal(t, JwtTagA.String(), "jwt-tag-a")
 	xtesting.Equal(t, JwtTagB.String(), "jwt-tag-b")
 	xtesting.Equal(t, JwtTagC.String(), "jwt-tag-c")
+	xtesting.Equal(t, JwtStatus(20).String(), "jwt-?")
 }