diff --git a/go.mod b/go.mod index ee9b7a8..9d95830 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/access-handler go 1.24.5 require ( - gitea.tecamino.com/paadi/dbHandler v1.1.4 + gitea.tecamino.com/paadi/dbHandler v1.1.5 gitea.tecamino.com/paadi/tecamino-logger v0.2.1 github.com/gin-gonic/gin v1.11.0 github.com/go-playground/assert/v2 v2.2.0 diff --git a/go.sum b/go.sum index b361ac7..9c00f7c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.tecamino.com/paadi/dbHandler v1.1.4 h1:/yBwhRzBp823mF7Y0z68uxLEWCoIFeFd4aGdYYPk+Sc= -gitea.tecamino.com/paadi/dbHandler v1.1.4/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= +gitea.tecamino.com/paadi/dbHandler v1.1.5 h1:dxRfe095qlvaH/fiLQ1+/qwzX2zwN3PXlmd1UxC5Mc4= +gitea.tecamino.com/paadi/dbHandler v1.1.5/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE= gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM= github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= diff --git a/handlers/role.go b/handlers/role.go index 972d22a..f78a2d3 100644 --- a/handlers/role.go +++ b/handlers/role.go @@ -17,7 +17,7 @@ func (aH *AccessHandler) AddDefaultRole() (err error) { role := "admin" // Check if a role with this name already exists - if aH.dbHandler.Exists(&models.Role{}, "role", role, false) { + if aH.dbHandler.Exists(&models.Role{}, "", "role", role, false) { // Found a role → skip creation aH.logger.Debug("AddDefaultRole", "role "+role+" exists already") return nil @@ -52,7 +52,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) { } // Check if a role with this name already exists - if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) { + if aH.dbHandler.Exists(&models.Role{}, "", "role", role.Role, false) { aH.logger.Error("AddRole", fmt.Sprintf("role with name %s already exists", role.Role)) c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("role with name %s already exists", role.Role))) return @@ -160,7 +160,7 @@ func (aH *AccessHandler) DeleteRole(c *gin.Context) { ownRole = role continue } - err = aH.dbHandler.DeleteByKey(&models.Role{}, "role", role, false) + err = aH.dbHandler.DeleteByKey(&models.Role{}, "", "role", role, false) if err != nil { aH.logger.Error("DeleteRole", err) c.JSON(http.StatusInternalServerError, nil) diff --git a/handlers/user.go b/handlers/user.go index 06093e2..2439b19 100644 --- a/handlers/user.go +++ b/handlers/user.go @@ -29,7 +29,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) { } // Check if a user with this email already exists - if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) { + if aH.dbHandler.Exists(&models.User{}, "", "email", user.Email, false) { aH.logger.Debug("AddDefaultUser", "user email "+user.Email+" exists already") // Found a user → skip create return nil @@ -64,7 +64,7 @@ func (aH *AccessHandler) AddUser(c *gin.Context) { } // Check if a user with this email already exists - if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) { + if aH.dbHandler.Exists(&models.User{}, "", "email", user.Email, false) { // Found a user → skip create aH.logger.Error("AddUser", "user with email "+user.Email+" already exists") c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("user with email %s already exists", user.Email))) @@ -252,7 +252,7 @@ func (aH *AccessHandler) DeleteUser(c *gin.Context) { return } - err = aH.dbHandler.DeleteById(&models.User{}, removeIds...) + err = aH.dbHandler.DeleteById(&models.User{}, "", removeIds...) if err != nil { aH.logger.Error("DeleteUser", err) c.JSON(http.StatusInternalServerError, nil)